Refactor travis build out and add rugged test fix