moving git -> elpa
merge
Merge branch 'master' of https://github.com/pcompassion/.emacs.d