Routine Imac
Merge branch 'master' of https://github.com/shockingpants/GIT

Conflicts:
	cellsim/.viewer.py.swp
test
Merge branch 'master' of https://github.com/shockingpants/GIT