Add the submodules manually
Merge remote-tracking branch 'origin/master' into jdfreeman-conflict-free

Conflicts:
	.gitmodules
Merge pull request #20 from GrokInteractive/jdfreeman-conflict-free

Add the submodules manually