Hopefully fix some tests
Merge branch 'master' of jacob:/u/nlp/git/javanlp