Changes
Merge branch 'master' of github.com:epchris/emacs_setup
Stuff