Merge branch 'master' into FOF

configure.ac

doc/RTD/source/conf.py

examples/EAGLE_ICs/EAGLE_12/eagle_12.yml

examples/EAGLE_ICs/EAGLE_25/eagle_25.yml

examples/EAGLE_ICs/EAGLE_50/eagle_50.yml

examples/EAGLE_low_z/EAGLE_12/eagle_12.yml

examples/EAGLE_low_z/EAGLE_25/eagle_25.yml

examples/EAGLE_low_z/EAGLE_50/eagle_50.yml

examples/EAGLE_low_z/EAGLE_6/eagle_6.yml

examples/HydroTests/SodShock_1D/plotSolution.py

examples/HydroTests/SodShock_1D/sodShock.yml

...solatedGalaxy/IsolatedGalaxy_feedback/isolated_galaxy.yml

examples/PMillennium/PMillennium-1536/p-mill-1536.yml

examples/PMillennium/PMillennium-384/p-mill-384.yml

examples/PMillennium/PMillennium-768/p-mill-768.yml

examples/SantaBarbara/SantaBarbara-128/santa_barbara.yml

examples/SantaBarbara/SantaBarbara-256/santa_barbara.yml

examples/SubgridTests/StellarEvolution/stellar_evolution.yml

examples/parameter_example.yml

src/Makefile.am