Less verbose comments in cabal.sandbox.config.
Remove a spurious 'where'.
Don't add UserPackageDB to the sandbox PackageDBStack.

Fixes #1183.
Merge remote-tracking branch 'upstream/master' into extra-html-files
Installation extra-html-docs via proper mechanism