Updates for integration with travis for CI