Better emacs launching.
Merge branch 'master' of github.com:ciniglio/dotfiles

Conflicts:
	zshrc