Fixed bug where tokens would be munged together
Merge branch 'master' of https://github.com/duganchen/codesearch