Added version number and .build.sbt
Added travis details
Merge branch 'master' into scala-2.11

Conflicts:
	.travis.yml
	README.md
	project/project.scala
Fixed project file conflicts