Make serializer_from_block_or_class return the object not serialized
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
Merge branch 'kjg-serializer_from_block_or_class_update'
Merge branch 'master' into json_api_link_templates
Add a small blurb about links and link templates