Committing major changes. Cut the size of the ontology significantly and other
various changes
Merge branch 'MasterImproved' of github.com:Drin/spam into MasterImproved

Conflicts:
	Makefile
	com/drin/java/ontology/Ontology.java