Updated build for Scala 2.11
Removed Vi swap file
Corrections for Scala 2.11
Merge branch 'scala-2.11'

Conflicts:
	project/build.scala