Added some stuff to emacs. Other than that, everything's peachy
Merge branch 'master' of https://github.com/aparato/dotfiles

Not sure