Merge branch 'peter'
and one more small fix...

for some reason, the raw_input call in _db_root_info wasn’t playing
nicely with the second import statement (line 242). I just removed it
and have the force_update check that “user” in config is root.
Merge branch 'master' into peter