feature structure unify
Merge branch 'master' of https://github.com/sfu-natlang/xtag-nltk

Conflicts:
	parse.py
split