Tweak bash prompt w/ more info
Merge branch 'master' of softmoth.github.com:/softmoth/dotfiles