Updated submodules
Commit after merge from ur1
Merge branch 'master' of https://github.com/gneuvill/Emacs-Configuration

Conflicts:
	.gitmodules
	customize-settings.el