Tokenizer1: Further fixes to ampersand handling.
Merge branch 'master' of git@github.com:factorie/factorie.git
Merge branch 'master' of git@github.com:factorie/factorie.git