Simplified bash prompt, using a bunch of stuff from liquidprompt, but not git, it's too expensive
Merge branch 'master' of github.com:apexskier/dotfiles