refresh the bootstrap script
bump get-pip.py to pip 1.5.6
Merge branch 'master' into develop