version bump to 0.3.1
Merge branch 'master' into cdh4

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