- minor edits
Merge branch 'master' of https://github.com/cb0/memacs

Conflicts:
	emacs.d/init.el