Merge pull request #766 from tphoney/disable_ftp_tests_travis