Cleanup and fixing Travis builds