Fixups to Nate's anonymized id mapper, repairing pep8 and pylint errors, and rebasing on recent master.