Fixes after merge.
Fixes after merge.

digitalreasoning/factorie-scala-210,hlin117/factorie,pogren-oracle/factorie,asubbaswamy/factorie,joprice/factorie,malcolmgreaves/factorie,patverga/factorie,zxsted/factorie,Craigacp/factorie,melisabok/factorie,factorie/factorie,strubell/factorie