added commented out file
Merge branch 'submodulebase' of ../jtuley-keyczar-dev

Conflicts:
	.gitmodules
	python/testdata
Merge branch 'master' into google_code