Remove deprecated pip options for travis.ci
Pep8 updates, whitespace.