Python3 updates (ran 2to3 and .plugin update)