Fixed bootstrapping and README for pip 1.5
Merge branch 'master' into develop

Conflicts:
	bootstrap.sh