some changes to zoo.test
some minor changes to zoo.py, and some other stuff
Merge branch 'master' of https://github.com/AnantaData/GSOM

Conflicts:
	.idea/workspace.xml
	gsom.py
	gsom.pyc