Cleaning up the pharmacology system
Merge pull request #9 from MFernflower/master

Cleaning up