Mirroring travis updates

self-merge