Local stuff
Merge branch 'master' of https://github.com/j-mckitrick/dot-emacs

Conflicts:
	jcm-general.el
	jcm-work.el
Snapshot