Misc settings updates
Merge branch 'master' of github.com:choltz/emacs-config