Merge pull request #20 from lawinslow/master

Updated default values for model runs
Merge remote-tracking branch 'upstream/master'