Show correct error
Merge from master
Consolidate methods for finding goats
Fix herd adding logic, with caveats noted in test source
even more tests work now
Fix customcols; all preexisting tests pass