two-stage bootstrap, remove --relocatable
simplify pipe test
punt on coverage, for a minute
fix tests
fix py3
coverage for stage2
fix stage2 test
fix coverage
fix py34, more, again
Merge branch 'master' of github.com:Yelp/venv-update into two-stage

Conflicts:
	venv_update.py