Travis working

cherry picked the commits of my travis branch that should not cause the build to fail.