Add scala-mode to emacs
Fix lisp error in auto-complete.el
Merge branch 'master' of https://github.com/shaoner/xconfig