Import script tweaks
Merge branch 'master' of github.com:sfbrigade/ohana-api