Merge pull request #4 from wtsi-npg/devel

devel
Merge remote-tracking branch 'wtsi-npg/devel' into devel
reset monitor to use local disk if FTP fails
Merge pull request #215 from srl147/devel

reset monitor to use local disk if FTP fails