very minor cleanup.
Merge branch 'neural' of github.com:dlwh/epic
sketches of features for span model.
Merge branch 'master' of github.com:dlwh/epic

Conflicts:
	src/main/scala/epic/trees/Tree.scala