using package.el+marmalade instead of submodules
Merge branch 'master' of github.com:rgarcia/dot-files

Conflicts:
	.gitmodules