Use proxy url for mortar_pypi
Merge branch 'master' of github.com:mortardata/mortar