A common, best-practices approach to development with git (see http://nvie.com/posts/a-successful-git-branching-model/)