Merge branch 'master' into doself2-vectorisation
Conflicts: src/cache.h src/hydro/Gadget2/hydro_iact.h src/kernel_hydro.h src/runner_doiact_vec.c src/runner_doiact_vec.h src/vector.h tests/benchmarkInteractions.c tests/testKernel.c
Conflicts: src/cache.h src/hydro/Gadget2/hydro_iact.h src/kernel_hydro.h src/runner_doiact_vec.c src/runner_doiact_vec.h src/vector.h tests/benchmarkInteractions.c tests/testKernel.c