add userid API query
remove some old/dead code around the importer
Merge branch 'master' into api
some final work before deploying more API stuff