Updating scratch message, turning off annoying modes, enabling org-config
Merge branch 'master' of github.com:mjsteger/custom_dotemacs

Conflicts:
	init.el