removed ensime and scala-mode2 cause i had no luck with it :-(
just some little changes, nothing special