updates the codebase for 2.10 (Part II)
updates the codebase for 2.10 (Part II)

works around a bug introduced in between M4 and today
a redundant "import protocol._" leads to a compilation error

tensory/ensime.github.io,tensory/ensime.github.io,tensory/ensime.github.io,tensory/ensime.github.io