Update Scala to 2.11.4, centralize build files
Merge branch 'scala-2.11.4'

Conflicts:
	build.sbt

Conflict was resolved by deleting build.sbt and adding -feature flag to
project/build.scala