Try generating a different kind of hint
Merge branch 'master' into hint

Conflicts:
	conda/resolve.py
Merge branch 'master' into hint
Allow to choose the alternate hint method via a command line flag
Merge pull request #671 from asmeurer/hint

An alternate method to generate an unsatisfiable hint