Moar cleanup.
Merge
Merge branch 'master' of
https://hellblazer@github.com/Hellblazer/Ultrastructure.git

Conflicts:
	json/pom.xml