Travis fixes

This fixes travis so that it will build and test properly now. Yay!