Tweak import script data locations
Merge branch 'master' into user_follows_wip