Merge config changes from MASC git repo
Merge branch 'master' of github.com:masc-ucsc/esesc into github_master