Updated build
Merge branch 'scala-2.11'

Conflicts:
	project/build.scala
Modified third party library resolution in build
Edited README file again