Merge branch 'scala-2.10' into scala-2.9

Conflicts:
	build.sbt
	src/main/scala/org/ensime/config/EnsimeConfig.scala
	src/main/scala/org/ensime/indexer/SearchService.scala
	src/main/scala/org/ensime/server/Project.scala
	src/test/scala/org/ensime/test/intg/BasicWorkflow.scala