add .gitignore
fix conflict
[ENH] add support for FreeBayes allele depths