revert pip/setuptools changes
pip v1.5.6, setuptools v3.6
new style of pip and setuptools vendoring
fix uploads
removed old pip vendoring style
3.4.0
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  3.4.0
  removed old pip vendoring style
  fix uploads
  new style of pip and setuptools vendoring
  pip v1.5.6, setuptools v3.6
  revert pip/setuptools changes