Parameters are now specified in the config file
Merge pull request #22 from MattRiddell/master

Parameters are now specified in the config file