`DS.Adapter.resolveMapConflict` can receive two arguments
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
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
Merge remote-tracking branch 'upstream/master'
add dist so i can use it in fiddles