Fix broken build as per Caiti's incantation
Merge branch 'master' of https://github.com/factorie/factorie
updates to parser
fixing example of linear-chain CRF
fixing build error (CubbieConversions inclusion)
Merge pull request #132 from peschue/ps

one build fix and one documentation fix
Merge branch 'master' of https://github.com/factorie/factorie