update import script, some other cleanup
Merge branch 'master' of github.com:muffinista/namey