Merge Gordon's current Blueprint work, plus pylint cleanups