moved a few aliases into the aliases file and fixed the git branch part of bashrc. The key was in the color setting statement of ps1