Upgrade to web-mode.el 10.0
Merge branch 'master' of github.com:sfstpala/.dotfiles

Conflicts:
	emacs