Add git aliases, show current branch in prompt