Fix #2471 merging with defaults
Merge pull request #2477 from caseywebdev/merge-defaults

Fix #2471 merging with defaults
add if statement and add passing test
trigger request event only if model extends Backbone.Events, and fix whitespace
Allow non-model object as second argument, with test.
Revert non-model sync commits.

Revert "Allow non-model object as second argument, with test."
This reverts commit 32743e6b60a9b02619cd39f1cbe00d3dd77639a9.

Revert "trigger request event only if model extends Backbone.Events, and fix whitespace"
This reverts commit 6d72e1be3568dad0556ceb438ab7d45ea29f365f.

Revert "add if statement and add passing test"
This reverts commit 2caf748651c5f927d9ce2c47723f307c5578f1ef.
Updating license to reflect DocumentCloud's correct attribution.
Fixing licensing typo.
Merge pull request #12 from documentcloud/master

上游合并