Merge branch 'master' of github.com:hippysurfer/rjt-emacs-init