add spaces to git modules
added commented out file
Merge branch 'submodulebase' into cpp/all

Conflicts:
	.gitmodules
	cpp/src/keyczar/data