Think this could also be simplified to:

def catalog_format
  indent = @opts[:json] ? '' : '  '
  Hash[@catalog.all.sort.map { |k, v| [k.sub(/heirloom_/, indent), v] }]
end

@keviny22 @thbishop thoughts?