Add git tracked branch to prompt and minor vim improvements