Always push current branch
Add git branch to prompt, remove legacy environment prompt colours