Merge pull request #2 from moonso/develop

Latest updates from Måns
Attempt to create some annotation tests at the vcf file level

Particularly important is the testing of the AR_comp model
Fix to a couple of files
Merge branch 'develop' of https://github.com/tzhughes/genmod into tzhughes-develop
Merge branch 'tzhughes-develop' into develop