Fix heroku and travis weirdness?