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.
add release date
fix issue #644
Include the error message on URLError
conda clean --lock: skip directories that don't exist

Fixes #648.
update changelog
Handle the bin directory not existing when creating conda symlinks
remove timezone information, should fix issue #651
update changelog
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