Only setting content-type to JSON if there actually is content.
Merge branch 'master' of github.com:enyo/data
Added a test for the content-type.
Only setting content-type to JSON if there actually is content.
Added a test for the content-type.
`DS.Adapter.resolveMapConflict` can receive two arguments
update the rest adapter test to pass the json content-type behavior
Better YUIDocs
Merge pull request #890 from thomasboyt/docs

Better YUIDocs
Merge pull request #887 from tricknotes/remove-not-referenced-argument

`DS.Adapter.resolveMapConflict` can receive two arguments
Eliminate unused variables

I used jshint with '"unused": true' option.
Merge pull request #888 from tricknotes/eliminate-unused

Eliminate unused variables
bump ember to rc2
Ember source now comes from the ruby gem.
ember now comes the from ember-source gem

Reduce some confusion
Merge pull request #892 from stefanpenner/remove_extra_ember

ember now comes the from ember-source gem
Notify that a default adapter type has been selected

This will notify that in the absence of custom adapter
a default has been selected.
link to s3 builds in README
Merge pull request #896 from fivetanley/readme-for-s3-builds

link to s3 builds in README
Merge pull request #891 from stefanpenner/upgrade_to_ember_rc2

Upgrade to ember rc2