Remove overridden bootstrap task in pavement, it is no longer needed
Add a manual edit to bootstrap to make sure setuptools/pip missing errors are more clear
Merge branch 'master' into html_increment