Simplify regexp

It's been tested against python 2.6.5 and 2.7.5, hopefully
2.7.3 (travis) will also be happy