Squashed patch for issues 1059 1115 1091
Merge pull request #117 from ENCODE-DCC/1059-1114-1091-edw-sync-new

Squashed patch for issues 1059 1115 1091
Merge branch 'master' into ethnicity-biosample-1117