Travising... and some heroku fixing