Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
changing a few stray DepParser2 references in comments and in the QSubExecutor for the parser trainer
app.nlp: adding functionality to DocumentAnnotatorMap to actually compute annotations
app.nlp: removing process() functionality from DocumentAnnotator and using the one in the annotator map
app.nlp: fix doc/document bug
Merge pull request #22 from akobre01/master

isProperNoun looked incorred; now fixed
Merge branch 'master' of https://github.com/factorie/factorie
nlp: doing the changes discussed in a meeting with andrew; still needs better names
Merge remote-tracking branch 'upstream/master'
Parallel LDA implementation
Merge pull request #24 from vineetmundhra/master

Parallel LDA Implementation
put pool shutdown in a finally block, fix parallelization wrt types for Parallel LDA
Merge pull request #25 from vineetmundhra/master

Parallel LDA changes based on review
optimize: TrainerHelpers.withThreadPool properly shuts it down
app.nlp.parse.DepParser1: using TrainerHelpers.parMap instead of a manual thread pool
app.nlp: fixing LoadConll2003 to work with the new Bilou / Bio labels
app.nlp: finishing the removal of Conll2003ChainNerLabel
optimize: using TrainerHelpers.parForeach instead of .par.foreach
app.nlp.ner.NER1: removing fixLabels, which replaces BILOU labels with BIO labels using the BILOU class for no good reason...