Added get_object and get_collection methods
Patched in bugfixes from genotyping made since the code was split, in
preparation for removing code from genotyping.