update settings
Merge branch 'master' of https://github.com/jsuper/.emacs.d