updated init.el
Merge branch 'master' of https://github.com/jkshum/emacs

Conflicts:
	#init.el#
	.emacs.desktop
	.mc-lists.el
	ac-comphist.dat