Pre-merge
Merge branch 'master' of github.com:sjolsen/emacs2

Conflicts:
	.emacs.d/.mc-lists.el