Update README
Fix DateTimeZoneSpec by adding an explicit extractor that serializes a DateTimeZone as its ID.

Conflicts:
	salat-core/src/test/scala/com/novus/salat/test/DateTimeZoneSpec.scala
Update casbah deps from 2.4.1 to 2.5.0.
Remove xsbt-gpg-plugin from plugin deps
Fix JSON Option[BigDecimal] and Option[BigInt] deserialization error reported in #78
Added spec showing that deserializing Option[ObjectId] works for both string and strict strategies for #79
Updated casbah dep to 2.6.0.
Updated sbt to 0.12.3, cleaned house on plugins
Update casbah dependencies to 2.6.1, including test dependency on casbah-commons test jar for specs2 helpers.
Add option, traversable and map support for custom transformers.
Merge branch 'master' into salat_2.10

Conflicts:
	project/SalatBuild.scala
	project/plugins.sbt
	salat-core/src/main/scala/com/novus/salat/conversions/JodaDateTimeZoneHelpers.scala
	salat-core/src/main/scala/com/novus/salat/dao/SalatMongoCursor.scala
	salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala
	salat-core/src/main/scala/com/novus/salat/transformers/inject/Injectors.scala
	salat-core/src/test/scala/com/novus/salat/test/IgnoreAnnotationSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/KeyAnnotationSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/AlphaDAO.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/ChildCollectionSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/ModelCompanionSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/MyModel.scala
	salat-core/src/test/scala/com/novus/salat/test/model/TestModel.scala
	salat-core/src/test/scala/com/novus/salat/test/test.scala
Merge branch 'master' into salat_2.10

Conflicts:
	project/SalatBuild.scala
	project/plugins.sbt
	salat-core/src/main/scala/com/novus/salat/conversions/JodaDateTimeZoneHelpers.scala
	salat-core/src/main/scala/com/novus/salat/dao/SalatMongoCursor.scala
	salat-core/src/main/scala/com/novus/salat/json/JSONConfig.scala
	salat-core/src/main/scala/com/novus/salat/transformers/inject/Injectors.scala
	salat-core/src/test/scala/com/novus/salat/test/IgnoreAnnotationSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/KeyAnnotationSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/AlphaDAO.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/ChildCollectionSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/ModelCompanionSpec.scala
	salat-core/src/test/scala/com/novus/salat/test/dao/MyModel.scala
	salat-core/src/test/scala/com/novus/salat/test/model/TestModel.scala
	salat-core/src/test/scala/com/novus/salat/test/test.scala