This also includes the parameter extension functionality again, which for whatever reason is missing from master. Mostly notebook related though.
# Conflicts: # xfel_calibrate/calibrate.py # xfel_calibrate/notebooks.py
