default data to a hash so we no longer need is_a checks
Merge pull request #499 from tenderlove/rm_conditional

default data to a hash so we no longer need is_a checks