Revert "Merge pull request #404 from josenavas/travis"

This reverts commit bc126f0aa9b3667d5c88d541e20b0481f9438509, reversing 
changes made to f595430a1588f43086adaf9839a643c56b11ca1c.

Hopefully things will run faster after this.