Dinocatalog

Refactored filters, changed mappers to use hash, few other name changes. 
Align the parameters of a method call if they span more than one line.