Add org-sexp-date face
Alphabetized
Merge pull request #115 from josherrickson/master

Add org-sexp-date face
Use a less subtle negation char face
Add new Emacs 24.4 font-lock regexp faces
Remove obsolete face font-lock-doc-string-face
Update docstring
Update js2 variable names
Merge pull request #117 from daf-/master

Update js2-mode face variable names
A few font-lock refinements
Merge branch 'master' of github.com:bbatsov/zenburn-emacs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Customize flx-highlight-face
Use a bit lighter doc-face
Bump version to 2.1
Merge branch 'master' into working