Make travis use a clean virtualenv
virtualenv always includes distribute or setuptools, so try upgrading setuptools.
Merge branch 'master' into js-view-lookup-refactoring