Resolve merge conflict
New: -D switch for use in play-story command
New: -P switch for use in play-story
Remove addDefines() method from StoryTemplate; added in error
Tweak: make getParams() uber-flexible
Fix: improve robustness of $st->getParams()
Fix: improve robustness of $st->getParams()
Fix: $st->getParams() now throws a useful error message when a bad param provided
Merge pull request #29 from datasift/feature/defines-switch

[Feature] -D / -P switch