Working on Emacs junk on office comp.
Merge branch 'master' of github.com:IanFinlayson/config

Conflicts:
	emacs