Emacs now uses bash instead of zsh for the shell, but I may change this back later. Also, .bashrc doesn't change the prompt if inside emacs.
Merge branch 'master' of https://github.com/robertutterback/configs
merge