Fix new regex that was causing everything to fail

- go back to checking for `match[3] || match[5]` which makes everyone
  feel really sad inside.
Add Travis yml file for testing