Update from job.
Merge branch 'master' of github.com:laynor/emacs-conf

Conflicts:
	modules/sm-module-base.el