Mirroring travis updates
Merge pull request #1 from gamechanger/jh-travis-updates

Mirroring travis updates