working on shawns code
Merge branch 'tropical' of https://github.com/LoLab-VU/pysb.git into tropical