added annotation level to NgramModel constructor
added some experiments calling getTargetAnnotations() instead of getTargetPhrase()
added a new function getTargetPhraseOrAnnotations in PhrasePair.h which calls either getTargetPhrase() or getTargetAnnotations() depending on the annotation_level.
tidied up NgramModel and FeatureFunction. added annotation level to the logger in NgramModel
Merge branch 'master' of https://github.com/chardmeier/docent into aaron
added annotation level to NgramModel constructor
added some experiments calling getTargetAnnotations() instead of getTargetPhrase()
added a new function getTargetPhraseOrAnnotations in PhrasePair.h which calls either getTargetPhrase() or getTargetAnnotations() depending on the annotation_level.
tidied up NgramModel and FeatureFunction. added annotation level to the logger in NgramModel
Fixed word penalty bug affecting certain platforms.
Disabled reference tracking on phrase and phrase pair flyweights.
Fixed flyweight serialisation templates.
Merge branch 'aaron' of https://github.com/chardmeier/docent into aaron
added Bleu model feature function
tidied up BleuModel code
tidied up way modified tokens vector is created by using std::insert instead of loops
used iterators to construct modified parts of sentences instead of from and to integers
refactored estimateScoreUpdate to remove unnecessary extra loop and storing of iterators
tidied up code in initDocument function
merged in branch with Bleu feature function