Merge pull request #28 from stanleygu/master

Adding modules to tellurium
Merge pull request #29 from stanleygu/master

Including all the new modules in setup.py
Merge remote-tracking branch 'upstream/master'