Update for 0.0.11 release.
Merge branch 'master' into scala-2.9.x

Conflicts:
	build.sbt