Refactor match into DidMatch and NoMatch

Save that extra pointer to [][]int for the match indices
Merge branch 'master' into refactor-match

Conflicts:
	keymap.go
Merge pull request #64 from lestrrat/refactor-match

Refactor match into DidMatch and NoMatch