Allow underscores in shortnames
move shortname regex into a variable

This way we only have to update the regex once if it changes again
Merge pull request #47 from mfairchild365/shortnames

Allow underscores in shortnames