Fixed it for real this time.
Misc travis changes.