Further travis enhancements

WIP, ___do not merge___ :)