emacs: GTFO nxhtml, web-mode yay!, update submodules
Merge branch 'master' of github.com:skgsergio/dotFiles

Conflicts:
	.emacs