Use Travis default builder (now using sbt-extras)
Merge pull request #71 from gildegoma/sbtextras-on-travisci

Use again Travis CI default builder (now based on sbt-extras)
Travis CI: build agains Oracle and Open JDK7

Remove OpenJDK6 because it fails on new travis 64-bit infrastructure
Merge pull request #72 from gildegoma/travisci-jdk-matrix

Travis CI: build against Oracle and Open JDK7
Bump specs2 dependency version.
Initial support for custom transformers.  One hand, one million dollars, no tears.
#75 - fix aggregator package - thanks to @rozza
(cherry-picked from 5467df4a9e)
Scalariform
Merge branch 'master' into salat_2.10

Conflicts:
	project/SalatBuild.scala
Merge branch 'master' into salat_2.10

Conflicts:
	project/SalatBuild.scala
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
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
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