version bump to 0.3.1-cdh3-SNAPSHOT
Merge branch 'master' into cdh3

Conflicts:
	build.sbt
	src/main/scala/scamr/Version.scala