change branching model

Change branching model to follow the model described here
http://nvie.com/posts/a-successful-git-branching-model/