ADS-1
Moved parts of .travis.yml into puppet/travis.pp