fixed setup.py
Merge branch 'master' of github.com:JohnAbel/GillesPy

Conflicts:
	gillespy/__init__.py