Simplified build and fixed Travis