tree feats
Revert "tree feats"

This reverts commit e44587c36adb8034eda07095c67b04f10a11af4e.
Feature generation bug
Merge branch 'master' of github.com:jmnybl/Turku-Dependency-Parser
JK-tagged (with marmot), scrambled version of the TDT training file.
Marmot-tagged test file
Minor changes to transition system
merge master, conflicts fixed