setup.py closer to functionality
Merge branch 'master' of github.com:JohnAbel/GillesPy

Conflicts:
	gillespy/__init__.py
	setup.py
closer to setup.py working