Merge branch 'hotfix/annovar-format'
Merge branch 'hotfix/annovar-format'
Clean up thetas rules. Fix += ifndef statements
Merge branch 'hotfix/angsd-simplify-thetas' into develop