updated analysis_step and pipeline objects.
Update .travis.yml

pegging version of bootstrap.py
removing changes
setup tools upgrade after activate
Merge pull request #483 from ENCODE-DCC/travis_fix

Travis fix
Upgraded setuptools default version
Merge pull request #484 from ENCODE-DCC/setuptools_fix

Upgraded setuptools default version
Merge branch '2419-supervisor' into 1400-lab-pipelines
Merge branch 'master' into 1400-lab-pipelines
Merge branch '2419-supervisor' into 1400-lab-pipelines
Merge remote-tracking branch 'origin/1400-lab-pipelines' into 2419-supervisor
add derived files to test data