Merge remote-tracking branch 'upstream/master'
upstream merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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'
switch back to solarized dark
merge fix