don't just return self from to_hash
Merge branch 'class_name_in_to_json' into forked_stuff
bump