Bug fixes.
Merge branch 'master' of https://github.com/kpurdon/emacs-config

Conflicts:
	general/general.el