changes to deal with s3 files
updated for when errors isn't rpesent
added log level debug
added masterVar, VCF to FileType and Added default GenomeReferences
updated to deal with s3 files
merged the vcf code with the s3 code

Merge branch 'master' of github.com:systemsbiology/GMS

Conflicts:
	app/models/assembly.rb