Adds ensime to the mix.
Merge remote-tracking branch 'upstream/master'