* various changes
Merge branch 'master' of github.com:apgwoz/emacs-config

Conflicts:
	activator.d/42org.el