Merge remote-tracking branch 'bbatsov/master' into bbatsov-master
Merge remote-tracking branch 'bbatsov/master' into bbatsov-master
disable font-lock-mode by default when web-mode is activated
Merge remote-tracking branch 'bbatsov/master' into bbatsov-master
Don't swap Command & Option by default
Merge branch 'master' into bbatsov-master
Merge remote-tracking branch 'bbatsov/master' into bbatsov-master
latest changes from bbatsov/master make swap-meta-and-super.el unnecessary