adding ability to pass custom options into test file
fixing typo in docs for custom params
merge master, fix conflicts
change option addition to use new convention
Merge pull request #33 from theresaanna/master

Adding ability to define arbitrary options to be passed into tests from Grunt config