Revert "Travis changes"

This reverts commit 22cd346d150a2925966d849267c591e910b09ee9.