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