Fix Travis matrix according to josh-k's recommendation.