Updating emacs
Merge branch 'master' of github.com:seanhagen/dotfiles