Switch to new regexp library
Merge pull request #2 from kemurphy/upstream-regexp

Switch to new regexp library