Fix issue #219: I/O operation on closed file exception with --log
Fix #70 and #350: options were messed up because of Command.merge_options()

Issue #70: install --timeout ignored and
Issue #350: Pip lies about log location
Add test to ensure --log and --log-file work well together