Update regex to handle extra whitespace in query
Fixed breaking mistakes in regex

Unnecesary extra capture groups. Accidentally removed space after
"from" - replace with 1+ whitespace gobbler
Merge pull request #2 from Oblongmana/master

Regex Update