Would be good if we could clean up legacy branches and follow a more structured git branching model like http://nvie.com/posts/a-successful-git-branching-model/