Merge branch 'develop' into develop_local

Author: jtwigg

.gitmodules

@@ -3,9 +3,9 @@
 url=https://github.com/slembcke/Chipmunk2D.git
 [submodule "external/ogg"]
 	path = external/ogg
-	url = git@github.com:apportable/ogg.git
+url=git@github.com:spritebuilder/ogg.git
 	branch = apportable
 [submodule "external/tremor"]
 	path = external/tremor
-	url = git@github.com:apportable/tremor.git
+url=git@github.com:spritebuilder/tremor.git
 	branch = apportable