comment
Factor out Token
Merge remote-tracking branch 'origin/master'

Conflicts:
	cardea.go
Too big commit

- Update tests for changes in pasring
- Generate regexp programmatically for readability
- Drop WebKit UA conflate hack