update scala-mode2, simple edits to init.el ... moving code from local to packages