grr
Merge branch 'master' of https://github.com/jmaelstrom/emacs

Conflicts:
	emacs-conf/cache/ido.last