update .emacs
Merge branch 'master' of github.com:nathanielksmith/dotfiles