Enhancements:
-------------

* add a numpy.distutils patch to jinja templating, so that fortran projects using numpy can also use jinja2 (thanks @bladwig1) #1252

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

* prefix build and test envs with _, so that conda can be installed in them #1242
* fix bdist_conda; add smoke test for it to Travis #1243
* fix windows entry points (duplicate bad logic) #1246
* fix inspect entry point in embedded conda.recipe #1251
* create build environment before looking for VCS in it.  #1253
* fix a deadlock with recursive environment creation on encountering packages with short prefixes #1257