Removed ConditionalPriorDict inheriting from CBCPriorDict

I suggest temporarily removing this because it has been causing some issues so far. I will add some more elaborate tests to make sure it works reliably before we revert the change

Required !682 (merged)

test/gw_likelihood_test.py

@@ -45,7 +45,7 @@ class TestBasicGWTransient(unittest.TestCase):
         """Test log likelihood matches precomputed value"""
         self.likelihood.log_likelihood()
         self.assertAlmostEqual(self.likelihood.log_likelihood(),
-                               -4055.25243177871, 3)
+                               -4055.265194950631, 3)
 
     def test_log_likelihood_ratio(self):
         """Test log likelihood ratio returns the correct value"""
@@ -114,7 +114,7 @@ class TestGWTransient(unittest.TestCase):
         """Test log likelihood matches precomputed value"""
         self.likelihood.log_likelihood()
         self.assertAlmostEqual(self.likelihood.log_likelihood(),
-                               -4055.25243177871, 3)
+                               -4055.265194950631, 3)
 
     def test_log_likelihood_ratio(self):
         """Test log likelihood ratio returns the correct value"""