Travis Adjustments

Adjustments towards green travis build.