FIX: vsftp improvements from Rich Mellor on mailing list
Merge pull request #406 from grooverdan/vsftp

ENH: vsftp improvements