Added content to README
Changed back to Scala 2.10.4
Merge branch 'master' into scala-2.11

Conflicts:
	README.md