updates to regexes to handle job_types better
better formatting for test data
Merge pull request #90 from mozilla/regex-12132013

updates to regexes to handle job_types better