Add web-mode.
Merge personal dotfiles remote.

Conflicts:
	emacs.el