Merge branch 'hotfix/halo-readd-merge-label' into develop
Merge branch 'hotfix/add-milou' into develop
Merge branch 'hotfix/fix_nchr_typo' into develop
Merge branch 'hotfix/fix-em2-exp' into develop
Merge branch 'hotfix/halo-precious' into develop
Merge branch 'hotfix/halo-gatk-2.7' into develop
Merge branch 'hotfix/annovar-format' into develop
Merge branch 'hotfix/angsd-simplify-thetas' into develop
Move include statements to end of file. Add section for overriding recipes
Fix ifdef statments
Cleanup makefiles

1. Makefile.angsd

  - add utility variables
  - add .ln rule
  - add ngstk

2. Makefile.halo
   Move two recipies after include statement. May not be necessary

3. Makefile.analysis.angsd
   Add docstrings and examples
Add documentation
Merge branch 'feature/angsd-improvements' into develop
Merge branch 'develop'