Merge pull request #13 from kbroman/master

fitqtlF wasn't dealing with pheno.cols properly
fix a bug