Revert "travis, ignore this branch please (take three)"

This reverts commit 1b4c9b2002bc1ef1a41134b4738cc4808459b203.