Update minisat to use version from https://github.com/niklasso/minisat/
Work on getting minisat+ to use https://github.com/niklasso/minisatp/
Merge branch 'master' of github.com:pydata/conda-recipes