updated a few config files
Merge branch 'master' of github.com:floatingman/.emacs.d