Merge travis fixes to consolidate branch