More emacs changes
Update plugins
Merge branch 'master' of git://github.com/maarons/dotfiles