Fix #844
Update 1.5 branch re #84 so it doesn't barf on Paramiko 1.10
Merge branch '1.5'

Conflicts:
	fabric/network.py
Bump to 1.5.4
Merge branch '1.5' into 1.6

Conflicts:
	fabric/version.py