merged hubflow from https://github.com/johnschult/sublime-text-2-git