Fix typo on ssh.ProxyCommand
Changelog re #1046, fixes #1046
Apply fix from #917
Whitespace
Nuke super old and misleading 'integration' test file
Add integration level test proving #917
Make integration suite somewhat more idempotent
Add another integration test to try and cover #1056
Failing integration test proving #955
Apply space escaping to sudo'd put() mkdir.

Fixes #955
Merge branch '1.7' into 1.8

Conflicts:
	docs/changelog.rst
Too many 'catch & patch'
Merge branch '1.7' into 1.8

Conflicts:
	docs/changelog.rst
Try figuring out Travis failure :(
Upgrade test to not make umask assumptions
Merge branch '1.7' into 1.8
Cut 1.7.2
Merge branch '1.7' into 1.8

Conflicts:
	fabric/version.py
Formatting
Merge branch '1.7' into 1.8