Added some vocabulary improvements

NB:  This introduces some breaking changes in that some of the previously supported vocabulary will not work.  The extensions I wanted to add caused ambiguous step definition matches.