add git-emacs back into the mix
Merge branch 'master' of github.com:bunnymatic/dotfiles
add PG_USER=jon