fixing some things that were found after the inheritence ticket
Merge remote-tracking branch 'origin/master' into 1851-grand-fixes
Merge pull request #531 from ENCODE-DCC/1851-grand-fixes

1851 grand fixes