Change Travis secure variables back.

With the new merge strategy I think this may be the last time I need to do this.