Move include statements to end of file. Fix ifndef/endif += statements
Merge branch 'hotfix/halo-gatk-2.7'