More work trying to get Shippable CI working