Add changes to wxpython build.sh from the build on binstar
Merge branch 'master' of github.com:conda/conda-recipes