merged fix from Guillem Salas for bug https://issues.scala-lang.org/brow...

...se/SI-4267

- small changes in .gitignore to ignore lock files temporary generated by vi or vim
- add (if you don't mind) the sbteclipse plugin 
- And the most important, merge enhancements done by Guillem Salas
  https://issues.scala-lang.org/browse/SI-4267