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

Conflicts:
	conda/resolve.py
Add basic pinning functionality

If a file conda-meta/pinned is in an environment the lines of that file will
be added to the specs with every install. If the package is explicitly
included in the command line, it overrides the pin.

This does not yet affect conda remove.
Don't automatically override pinned packages

You can override all pinning with the --no-pin flag.
Added lsfiles command to list all files belonging to specified package
Merge branch 'master' into hint
Allow to choose the alternate hint method via a command line flag
Improved lsfiles command according to discussion from pull request (#659)
Corrected ignorePredefinedFiles condition in walk_prefix call
change default of --known option (now --unknown)
Merge pull request #671 from asmeurer/hint

An alternate method to generate an unsatisfiable hint
Update CHANGELOG
Corrected code to be compatible with PEP-0008

1. Adjusted names of functions and variables.
2. Rewrite compare operations of boolean values.
Merge pull request #659 from mutirri/feature-lsfiles

Added lsfiles command to list all files belonging to specified package
Update CHANGELOG
Update list of conda-build commands
Merge branch 'master' into pin

Conflicts:
	conda/cli/install.py
	conda/plan.py
Check for pinning in conda remove
Merge pull request #640 from conda/pin

Add basic pinning functionality
Update CHANGELOG