Forgot to push in these changes earlier. I expect I've
already covered some of them elsewhere and will need
to merge.
Merge branch 'zen' of https://github.com/IntersectAustralia/asvo-tao into zen

Conflicts:
	science_modules/src/base/sfh.hh
	science_modules/tests/base/lightcone_tile_iterator_suite.cc
	science_modules/tests/base/rdb_backend_suite.cc