Fix .travis file
Merge branch 'shakedown2' into sd2-reportervc-cv