New document annotator that can concatenate hyphenated tokens if they represent a single word
now works in place. name changed to dehyphenator
dehyphenator is now dehyphenating tokenizer since it itself tokenizes the document instead of taking as input a pre-tokenized doc
tentative name changes to some type params/methods/traits in the classifier framework
fix compile error and change LinearModel -> OptimizablePredictionModel
fix a typo in feature generation.
Merge pull request #97 from cllu/master

fix a typo in feature generation for mention entity type.
more name changes to LinearModel, LinearObjective, etc
Update README.md

Add memory export for sbt.  It's likely that less memory would suffice, but I chose a reasonable amount that is sufficient (`Xmx1g`).
Merge pull request #98 from schmmd/patch-1

Update README.md
fixing more build errors, as one does
serialize: adding buffering to all our streams in the hope of improving performance
Merge pull request #99 from alextp/buffering-streams

serialize: adding buffering to all our streams in the hope of improving performance
Merge branch 'master' of https://github.com/factorie/factorie into linearmodel-tweaks

Conflicts:
	src/main/scala/cc/factorie/app/nlp/coref/PairwiseCorefModel.scala
Merge pull request #96 from lvilnis/linearmodel-tweaks

tentative name changes to type params/methods/traits in "classify"
improve travis config
more travis tweaks
even more travis tweaks
last attempt at making travis work again
oops