Clean up the regex matching code, add test for rmatch.

Clean up the regex matching code, add test for rmatch. #207