Fixes issues #131 and #129.  Note that VCF export was broken in previous versions, in that the vcf produced was not formatted correctly.  Fixed now.