Project workflow

We roughly follow the development model described at http://nvie.com/posts/a-successful-git-branching-model.