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