Hotfixes after rebase

Minor fixes, pushing straight to mastser as one is a breaking bug, symlinks
in src/xfel_calibrate point to the wrong directory causing it to not be
able to find notebooks. Caught by !464 tests