Added reader for Subfind halo catalogues
Merge branch 'master' of https://github.com/pynbody/pynbody

Conflicts:
	pynbody/default_config.ini
Fixed screw-up