migration
Merge branch 'master' of github.com:trevstanhope/.emacs.d