Reinstate the pip timeout
Shuffle some commands back to before_install
Merge pull request #1294 from blink1073/streamline-travis

Reinstate pip timeout in the Travis-CI build