Version bump to 1.9.7-SNAPSHOT
Ensure that null gets output if context JSON config specifies it.
Updated SalatBuild to latest Scala and Casbah
Fix specs issue with ambigious implicit conversion
Merge pull request #124 from rozza/Casbah-2.7.0

Casbah 2.7.0 update
Updated Cashbah version for latest snapshot after merging @rozza pull request
Merge branch 'master' of github.com:novus/salat
Merge remote-tracking branch 'origin/master' into scala_2.9.x_backport

Conflicts:
	project/SalatBuild.scala
Merge remote-tracking branch 'origin/master' into scala_2.9.x_backport

Conflicts:
	project/SalatBuild.scala