Better git_branch setup, also gitignore