updated emacs.el
Merge branch 'master' of github.com:jagguli/dotemacs