Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes. 
likewise remove this comment; unless you meant it as reminder to yourself, in which case people commonly use [comment tags](http://stackoverflow.com/questions/3071732/is-there-a-standard-for-todo-etc-tags-in-comments)