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

Conflicts:
	conda/resolve.py
always use envs .pkgs cache
fix pkgs_dir_prefix() for multiple envs_dirs; update tests
Fix a few typos
Merge pull request #641 from certik/patch-1

Fix a few typos
Remove duplicate test function
Fix activate tests for nosetests

Apparently naming a variable "setup" is a no no.
Merge branch 'master' of github.com:conda/conda
Fix a typo
formating
add comment about root_dir
add value of PYTHONHOME to output
update changelog
Use more standard terminology

Thanks Reddit.
Merge branch 'master' of github.com:conda/conda
Fix a bug with conda remove

It needs to send the index to display_actions in case it needs to download
something (e.g., when removing a feature).
greatly simplified code to handle location of package cache directories
Handling bad metadata better
Merge branch 'master' of github.com:conda/conda