Typo.
Add a global '--sandbox-config-file' option.

Allows to specify an alternate location for the sandbox config file
(@cabal.sandbox.config@) instead of the current directory.

Usage: 'cabal --sandbox-config-file=/path/to/config build'.

Fixes #1356.
Merge remote-tracking branch 'upstream/master'
Some cleanups..