Rebase from upstream, remove Python 2 from CI, and set use_2to3=False

Created by: robertbruntz

Rebased 'master' branch on fork by Robert Bruntz onto 'master' branch on main repo.