Resolves #409. Now matches dashes in addition to alphanumeric and _ characters
Refactored regex to use \w again and simply add - to the group
Updated Tests to check for the updated keys, moved old keys to deprecated list
Or maybe they shouldn't be listed in deprecated and checked
Fixed deprecated keys... to use the newer route
Travis pointed out my typo in the deprecated field
Merge pull request #410 from EdHurtig/master

Match dashes in addition to alphanumeric and underscore