update
Merge branch 'master' of https://github.com/schnecki/dot-emacs-4-everyone
	# Lines starting with '#' will be ignored, and an empty message aborts
merge to get everything running