rcodetools
Merge branch 'master' of https://github.com/purcell/emacs.d
update
merge master
Move .el files into lisp subdirectory

This avoids putting ~/.emacs.d on the load-path, which is apparently
deprecated, and now triggers a warning on start-up in recent Emacs snapshots.
Merge branch 'master' of https://github.com/purcell/emacs.d
resolve conflict