Updated gwas_cal... to work with emmax-kin gcc version
Merge branch 'master' of https://github.com/kbase/gwas

Conflicts:
	scripts/gwas_calculate_kinship_matrix_emma.pl
Merged changes