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
Fix for spaces in install directory and in env names
Start work on better printing of package version changes
Use new-style string formatting
Align things correctly
Only use as much space as needed
index cannot be None in display_actions anyway, so make it required
Split the display information into four categories

Also add a little more whitespace, for readability
Left-align the versions

It makes them easier to read.
Remove the old package table
Fix some duplication in the NoPackagesFound error message
Test for NoPackagesFound, not just RuntimeError
Fix NoPackagesFound for recursive dependencies
Merge pull request #667 from conda/nopackagesfound

Fix NoPackagesFound for recursive dependencies (fixes #666)
Update CHANGELOG
Keep a dictionary of Package objects