Abstract Travis Improvements

For @chriscct7 to grab the improvements made and save them for a pull to core at a later time.

DO NOT MERGE!