Better regular expression matching

This request contains two commits.  The first simply fixes the current regex behaviour so escaped slashes don't break the line.  The second adds additional highlighting to help break up long expressions, making them more readable.