updated settings
Merge branch 'master' of github.com:sebastiw/.emacs.d