Added comments to some faces in color scheme; added default mode for .es (EcmaScript) files
Merge branch 'master' of github.com:fourier/txm-emacs-scripts
Resolved conflicts