Refactored travis build