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

.gitignore

@@ -21,7 +21,6 @@
 LPD/results
 Test
 build
-cal_tools/agipdalgs.c*
 docs/build
 docs/source/_notebooks
 docs/source/_static/reports
@@ -30,6 +29,8 @@ docs/source/test_results.rst
 docs/source/test_rsts
 reportservice/*.log
 slurm_tmp*
+src/cal_tools/agipdalgs.c
+src/cal_tools/agipdalgs.cpython-36m-x86_64-linux-gnu.so
 webservice/*.log
 webservice/*sqlite
 webservice/webservice.yaml

src/xfel_calibrate/bin

-../bin
\ No newline at end of file
+../../bin
\ No newline at end of file

src/xfel_calibrate/notebooks

-../notebooks
\ No newline at end of file
+../../notebooks
\ No newline at end of file