Merge branch 'master' into Macpro
Routine Mac Pro
Merge branch 'Macpro'

Conflicts:
	cellsim/biochem.py
	cellsim/biochem.pyc
	cellsim/integrator.pyc
	cellsim/main.py
	cellsim/main.pyc