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