Conditionally load .emacs-site.el; honor customized directory location
Merge branch 'master' of https://github.com/alflanagan/my_emacs_stuff