Emacs configuration refactoring and finally working
Merge branch 'master' of github.com:vdemeester/emacs-config

Conflicts:
	.emacs.d/el-get.conf.el