add web-mode
update ruby-electric
Merge branch 'master' of https://github.com/kenjikitamura/.emacs.d