Sped up regular expression
Removed parentheses around x and y because we already had them in our character set
Merge branch 'master' of http://github.com/GlimmerLabs/MathOverImages