Delete white spaces as default on saving.
Combine imports scala.
Cleaning up backup and recovery. Also add a ediff command.
Changing lookup path for ensime as changes in github.
Adding db-run, reload and using -s option for ensime generate to add sources.
Merge remote-tracking branch 'origin/master'