Make Travis green.

I'm gonna see if I can get Travis all green and happy again :green_heart:

I'll comment when I'm done with all the changes.