More emacs conf
Merge branch 'master' of git://github.com/MassimoLauria/dotemacs

Conflicts:
	init-auto-complete.el