Import from files supported now
Merge branch 'master' of https://github.com/s-mage/vocabulary