Use 'bash'
Upgrade smex
Merge branch 'master' of github.com:anjensan/.emacs.d

Conflicts:
	init.el