fix to_h to include class name and safe_hash to not
Merge branch 'class_name_in_to_json' into forked_stuff
Merge remote-tracking branch 'origin/forked_stuff' into forked_stuff

Conflicts:
	fixtures/vcr_cassettes/test_xget.yml
bump