Remove unused imports.
Merge pull request #735 from kuyan/patch-2

Remove some unused imports
Combine API for match= and matches=; fixes #733 and #734
Some minor string cleanup also included
Completely rewrite match(es) API test cases, minor edits elsewhere
Merge pull request #736 from mc10/matches-api

Combine API for match= and matches=; fixes #733 and #734