Removed duplicate functions (_model_to_fit_params is defined again lower down, and _fitter_to_model_params is defined in fitting.py)
Fixed formatting of parameter names now that we are no longer using 2to3