Add -s and -h filters

Refactor into convenience functions
Fix require('catalog') to be relatively specified
Filter out fixtures not matching -s or -h options