Merge branch 'scala-2.10' of github.com:ensime/ensime-server into HEAD

Conflicts:
	src/main/scala/org/ensime/indexer/LuceneIndexer.scala
2.9 fixes