Revert "Changes specific to Scala 2.11."

This reverts commit d6bee9f9a338f9ffecbe8f1c4bd525e2fd61f5b6.
Merge branch 'scala-2.10' into scala-2.9

Conflicts:
	README.md
	build.sbt
	src/main/scala/org/ensime/model/Helpers.scala
	src/main/scala/org/ensime/server/Server.scala
	src/test/scala/org/ensime/test/SwankProtocolSpec.scala
2.9 compatibility changes for recent master commits

Conflicts:
	src/test/scala/org/ensime/test/SwankProtocolSpec.scala