Merge branch 'add-back-in-conversion' into 'master'

Adds back in the conversion

Closes #10

See merge request !7

bilby_pipe/data_analysis.py

@@ -178,8 +178,7 @@ class DataAnalysisInput(Input):
 
     @property
     def parameter_conversion(self):
-        return None,
-        #  return bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters
+        return bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters
 
     @property
     def waveform_generator(self):