Moving stuff around a bit in the code
Merge branch 'dev-widx' of github.com:UniversalDependencies/tools into dev-widx