Cleaned up shippable.yml a bit