Need to fix distribute_setup.py import in bootstrap.py. Therefore, putting it in this repo so the url keeps working.
Point bootstrap.py to our own distribute_setup.py.
Update CHANGES.rst.
Resolved conflicts in CHANGES