Loosen regex to allow for quoting quirk on Ubuntu 10.x
Tighten up regex a bit