for us Emacs folks, upgrade ENSIME version
Merge remote-tracking branch 'origin/master' into tortoise