Refactored spec to use the new matcher syntax.
Inlined version
Made keywords case sensitive.
Merge pull request #1 from cameron-martin/master

Several Changes