Travis updates and fixes