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

web-mode is now compatible with minor modes
Merge remote-tracking branch 'upstream/master'
Replace mini-map with sublimity; Conditionalize cua-replace-region workaround