Revert travis config changes to fix on separate branch