Miscellany:
-----------

* docs are moving from the conda-docs repo into conda-build (splitting off from conda docs in general)

Bug fixes:
----------

* fix re.escape usage for Python <3.3 #2970

Contributors:
-------------
* @mbargull
* @msarahan