Update settings
Merge branch 'master' of github.com:mjs2600/emacs-config-2

Conflicts:
	readme.org