Minor enhancements to be compatible with SBT 0.13. Fixes in tests.
Updated README.
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/ScalaBuffBuild.scala
	project/plugins.sbt
Re-re done ScalaBuffBuild.scala changes.
Re-re-re done ScalaBuffBuild.scala changes (accidentally used auto-merge).