Add the ability to use hyphens in variable names.

Underscores are already allowed, I've just added a changes to the tag regular expression to allow hyphens in variable names along with a test case.