cool margin learning thing
Merge branch 'feature-templates-parser-nonulls-templates' of https://github.com/strubell/factorie into feature-templates-parser-nonulls-templates