Merge branch 'master' into cbrt

.gitignore

README

configure.ac

examples/CoolingBox/coolingBox.yml

examples/CoolingBox/energy_plot.py

examples/CoolingBox/makeIC.py

examples/CoolingBox/run.sh

examples/CoolingBox/test_energy_conservation.py

examples/CoolingHalo/README

examples/CoolingHalo/cooling_halo.yml

examples/CoolingHalo/density_profile.py

examples/CoolingHalo/internal_energy_profile.py

examples/CoolingHalo/makeIC.py

examples/CoolingHalo/makeIC_random_box.py

examples/CoolingHalo/run.sh

examples/CoolingHalo/test_energy_conservation.py

examples/CoolingHalo/velocity_profile.py

examples/CoolingHaloWithSpin/README

examples/CoolingHaloWithSpin/cooling_halo.yml

examples/CoolingHaloWithSpin/density_profile.py