Fixed some more pipes
Merge branch 'python3' of github.com:esterl/routing-experiments into python3