Travis-CI error fixes.

This is just a PR to help fix the travis-ci related errors instead of pushing constantly to master!