Merge branch 'master' of github.com:modENCODE-DCC/modencode-gbrowse_conf
Merge branch 'master' of github.com:modENCODE-DCC/modencode-gbrowse_conf