refactored .emacs
Merge branch 'master' of https://github.com/b33fc4k3/.emacs.d