Hi,

We will keep the master branch for periodic merges with some guarantee of
stability for our users.

Development will happen on the develop branch.

This is a simplified version of the git-flow branching model:

http://nvie.com/posts/a-successful-git-branching-model/

We can adopt the fuller scheme later if need be.