Develop

First attempt at a pull request from my private fork. Many changes to halo_occupation module since the fork. Minor changes throughout.