Merged the contents of ParameterScan2 into ParameterScan1.
Removed ParameterScan2
Renamed parameterscan
Merge branch 'master' of https://github.com/sys-bio/tellurium
Changed __init__ to make calling shorter
Merge pull request #19 from violasox/master

Merged ParameterScan 1 and 2