Add changes to wxpython build.sh from the build on binstar
Merge branch 'master' of github.com:conda/conda-recipes
Bump build number of wxpython
Update readline patch, as per https://github.com/ContinuumIO/anaconda-issues/issues/42#issuecomment-35678527
Merge branch 'master' of github.com:pydata/conda-recipes
Update urwid
Updated gridmap to 0.12.3
Fix certificate issue with libsodium recipe https
Try to fix something
update lib sodium url

and rebuild libsodium, zeromq, and pyzmq
Merge pull request #92 from minrk/libsodium-url

update libsodium url
Add execnet
Add pytest-xdist
Merge branch 'master' of github.com:pydata/conda-recipes
pytest-xdist should preserve the egg directory
Updating the yt recipe for yt 2.6.2.
add gnureadline package
Merge pull request #94 from minrk/gnureadline

add gnureadline package
Merge pull request #93 from ngoldbaum/yt-2.6.2-rel

Updating the yt recipe for yt 2.6.2.
Fix merge conflict with libsodium meta.yaml