updated testing suite and fixed bugs
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #5 from duncandc/develop

Develop
Merging Duncan's changes to mock_observables
with my ongoing changes to get halo_occupation working with minimum destruction (which is still incomplete).

Merge remote-tracking branch 'upstream/develop' into develop