Got rid of old git-prompt code, borrowed some from Matthias Bynen's dotfiles repo