Bilby prior tidy

This MR slightly rationalises the way that the bilby prior is constructed, and updates the integration test to add spin information.