Travis Adjustments Batch 1

Adjustments towards green travis build.