Make iedit settings more tolerant of version settings
Merge branch 'master' of github:kaidadragonfly/.emacs
Add scala-mode to emacs