Split properly
Merge branch 'gh-pages' of github.com:sachac/.emacs.d into gh-pages