Merge branch 'SoftVision/SERV-719-use-standard-mongo-mapper' into fanhattan3

Conflicts:
	Gemfile
	lib/mongo_mapper/version.rb
	mongo_mapper.gemspec

	new file:   .bundle/config
	modified:   Gemfile
	new file:   Gemfile.lock
	modified:   lib/mongo_mapper.rb
	new file:   lib/mongo_mapper/config.rb
	modified:   lib/mongo_mapper/plugins/associations/base.rb
	modified:   lib/mongo_mapper/plugins/associations/belongs_to_association.rb
	modified:   lib/mongo_mapper/plugins/embedded_callbacks.rb
	modified:   lib/mongo_mapper/plugins/keys.rb
	modified:   lib/mongo_mapper/plugins/sci.rb
	modified:   lib/mongo_mapper/version.rb
	modified:   mongo_mapper.gemspec
	modified:   test/functional/associations/test_many_embedded_polymorphic_proxy.rb
	modified:   test/functional/associations/test_many_polymorphic_proxy.rb
	modified:   test/functional/test_sci.rb
	new file:   test/functional/test_stack_level_too_deep.rb
	modified:   test/unit/associations/test_many_association.rb
	modified:   test/unit/test_embedded_document.rb
	modified:   test/unit/test_rails_compatibility.rb
try time shortcut -- weird Time.at or to_f conflict with radix apparently
Upgraded legacy :safe calls to use the new :w option that the mongo driver is enforcing.

Conflicts:

	lib/mongo_mapper.rb
	lib/mongo_mapper/plugins/modifiers.rb

	modified:   lib/mongo_mapper.rb
	modified:   lib/mongo_mapper/plugins/modifiers.rb
	modified:   lib/mongo_mapper/plugins/querying.rb
	new file:   lib/mongo_mapper/utils.rb
write concern
Conflicts:

	lib/mongo_mapper/plugins/modifiers.rb

	modified:   Gemfile
	modified:   lib/mongo_mapper.rb
	modified:   lib/mongo_mapper/plugins/modifiers.rb
	new file:   lib/mongo_mapper/plugins/write_concern.rb
	modified:   lib/mongo_mapper/utils.rb
write concern 2
allow options hash to be passed to safe method
Revert "write concern 2"

This reverts commit 3b69644c074e3baaed47b4979eba386e7fafe58c.
Revert "typo"

This reverts commit 2e15ca75c6785835d35918037278e02e91dba90c.
Revert "write concern"

This reverts commit c969209fb7952df49e306e3cd1fdc5ffb6741589.
Revert "Merge branch 'tmdb' into fanhattan"

This reverts commit 31a99c671b0cd4dbb29d68cd6e4d18b8a367842e, reversing
changes made to 122439c810968e82023673c4c0586fb6829017bc.
Revert "Fix broken iso8601 time calls."

This reverts commit 5d0ccccb8c334a734f73cfe39ce8b91c1e978944.

Conflicts:

	lib/mongo_mapper/extensions/time.rb
Revert "Clean up."

This reverts commit cc3132a67f9b07dd9cb479e38e8ffa9026d1551c.

Conflicts:

	lib/mongo_mapper/plugins/keys.rb
Revert "Upgraded legacy :safe calls to use the new :w option that the mongo driver is enforcing."

This reverts commit aaf6141dac55d282a01c63c678f94417d9139c55.

Conflicts:

	lib/mongo_mapper.rb
	lib/mongo_mapper/plugins/modifiers.rb
Revert "Changing another instance of _type to _rbclass."

This reverts commit 5f9419bc757c2d3b80dc50b7f5fc425da628510f.

Conflicts:

	lib/mongo_mapper/plugins/keys.rb
Revert "Merging jnunemaker/mongomapper master."

This reverts commit f3fa6a424d8472bc3b613091d696b1095a7d2111, reversing
changes made to 197c2f649f574a0932773e73cca2c5cb1235af3f.

Conflicts:

	Gemfile
	lib/mongo_mapper/plugins/sci.rb
	lib/mongo_mapper/version.rb
	mongo_mapper.gemspec
Revert "Correctly define _id as bson ordered hash."

This reverts commit 197c2f649f574a0932773e73cca2c5cb1235af3f.

Conflicts:

	test/functional/test_modifiers.rb
Revert "Save typecast/uncast values and use those where possible, rather than recomputing them every time they're accessed."

This reverts commit 942003cca2c2daddac8615452fdf93387eb49108.

Conflicts:

	lib/mongo_mapper/plugins/keys.rb
Revert "Eliminate a couple more extraneous block bindings"

This reverts commit 400f4b3186c3a09d0f5f98ae4ff5f6ccf0efbb11.

Conflicts:

	lib/mongo_mapper/middleware/identity_map.rb
Revert "Don't iterate the whole cursor twice when using IdentityMap with #all. Improve performance by avoiding explicit block bindings, extraneous method calls, and extraneous array creation."

This reverts commit ab77215361ccbd03753976210625da829a7c57d9.

Conflicts:

	lib/mongo_mapper/plugins/identity_map.rb
Merge branch 'fanhattan3' into fanhattan

Conflicts:
	Gemfile
	lib/mongo_mapper.rb
	lib/mongo_mapper/plugins/embedded_callbacks.rb
	lib/mongo_mapper/version.rb
	mongo_mapper.gemspec

	modified:   Gemfile
	modified:   lib/mongo_mapper.rb
	modified:   lib/mongo_mapper/document.rb
	modified:   lib/mongo_mapper/extensions/time.rb
	modified:   lib/mongo_mapper/plugins/embedded_callbacks.rb
	modified:   lib/mongo_mapper/plugins/keys.rb
	modified:   lib/mongo_mapper/plugins/querying.rb
	modified:   lib/mongo_mapper/plugins/safe.rb
	modified:   lib/mongo_mapper/plugins/sci.rb
	new file:   lib/mongo_mapper/plugins/write_concern.rb
	new file:   lib/mongo_mapper/utils.rb
	modified:   lib/mongo_mapper/version.rb
	modified:   mongo_mapper.gemspec
	modified:   test/functional/test_safe.rb