update
Merge branch 'master' of github.com:aanjhan/.emacs.d

Conflicts:
	elpa/smex-2.1/smex-autoloads.el
	elpa/smex-2.1/smex.elc
...