More Regex goodness
Merge branch 'master' of https://github.com/DiceHoldingsInc/developer