Make our command parser less eager

Fixes #1152
Make regex more specific
Merge pull request #1153 from JabbR/less-eager-command-parser

Make our command parser less eager