merged
Merge branch 'master' of https://github.com/jkshum/emacs

Conflicts:
	.gitignore
	ido.last
	init.el