cleaned up model_import
Merge branch 'master' of https://github.com/gittenberg/WCM