web-mode is now compatible with minor modes
various modifications
Merge pull request #485 from bixuanzju/patch-1

web-mode is now compatible with minor modes
Merge branch 'master' of https://github.com/bbatsov/prelude

Conflicts:
	modules/prelude-web.el
change font to Source Code Pro, various cleaning.