Merge es into master!

It's been a long time coming. Switching to an entirely different data model was hard work, but the speed, multilanguage support, and the rest of the new features will be enjoyed for years to come. Thanks to all who contributed!

In the merge commit...
* Update some docs to stop referring to the es branch.
* Bump setup.py version to 2.0.
* Fix a mismatch in the requirements.txt and setup.py versions of parsimonious that would cause DistributionNotFound errors if `peep install` were run last and insecure downloads if `setup.py develop/install` were run last.

Author: erikrose

README.rst

@@ -1,19 +1,16 @@
-.. note::
-
-     Most development is now taking place on the ``es`` branch. ``master`` is in maintenance mode for the moment.
-
 ===
 DXR
 ===
 
 DXR is a code search and navigation tool aimed at making sense of large
 projects like Firefox. It supports full-text and regex searches as well as
 structural queries like "Find all the callers of this function." Behind the
-scenes, it uses trigram indices, the re2 library, and static analysis data
+scenes, it uses trigram indices, elasticsearch, and static analysis data
 collected by instrumented compilers to make searches faster and more accurate
-than is possible with simple tools like grep.
+than is possible with simple tools like grep. DXR also exposes a plugin API
+through which understanding of more languages can be added.
 
 .. image:: docs/source/screenshot.png
 
 * Example: http://dxr.mozilla.org/
-* Documentation: https://dxr.readthedocs.org/en/es/
+* Documentation: https://dxr.readthedocs.org/

docs/source/conf.py

@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = '2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name='dxr',
-    version='0.1',
+    version='2.0',
     description='Source code static analysis and browsing',
     long_description=open('README.rst').read(),
     author='Erik Rose',
@@ -36,7 +36,7 @@
                       'Mercurial>=3.4',
                       'more-itertools>=2.0,<3.0',
                       'ordereddict>=1.1,<2.0',
-                      'parsimonious==0.6',
+                      'parsimonious>=0.6,<0.7',
                       'pyelasticsearch>=1.1,<2.0',
                       'Pygments>=2.0.1,<3.0',
                       'python-hglib>=1.6,<2.0',