Made Ethnicity conditional.
Made Sex field conditional.
Merge branch 'master' into ethnicity-biosample-1117
Merge pull request #119 from ENCODE-DCC/ethnicity-biosample-1117

Ethnicity biosample 1117