Merge branch 'master' of https://github.com/fxbois/web-mode

Conflicts:
web-mode.el
Merge branch 'master' of https://github.com/fxbois/web-mode

Conflicts:
	web-mode.el