Fixed Jnana's git-prompt
Merge branch 'master' of Github:Libbum/dotfiles