Small config changes
Merge branch 'master' of https://github.com/lmichelbacher/emacs

Conflicts:
	init.el