Make serializer_from_block_or_class return the object not serialized
Use Kernel.warn instead of puts
Only test one thing per test
Include nested entites in the top level linked hash
Merge pull request #22 from kjg/json_api_subent_top_linked

Json api subent top linked
Allow for serializing json api resource collections into root key
Merge pull request #23 from kjg/json_collections

Allow for serializing json api resource collections into root key
Bumped version to 0.2.4, JsonAPI fixes
Do the correct thing for nil entities
Don't show entities that were empty
Merge pull request #25 from kjg/json_api_nil_entities

Good stuff. Thanks!
Bump version to 0.2.5

* JsonAPI fixes
Correctly output the json api link 'object' format
Support both string/number/array, and link objects
Raise error when providing both id and ids
Remove completed work from TODO
Merge pull request #26 from kjg/json_api_attribute_links

Json api attribute links

It makes sense holding off the gem release until #27 is also merged I think. Good to have a fully-implemented JsonAPI at last!
Add top level link templates to json api
Update TODO
Merge branch 'serializer_from_block_or_class_update' of github.com:kjg/oat into kjg-serializer_from_block_or_class_update

Conflicts:
	lib/oat/adapter.rb
	lib/oat/adapters/hal.rb
	lib/oat/adapters/json_api.rb
	lib/oat/adapters/siren.rb