Update .emacs
Merge branch 'master' of github.com:barrkel/barrkel