Update catalog to include magnitude measurements from Subaru and CFHT. Also update config.py to choose SUBARU_R by default.
Merge branch 'master' of https://github.com/emhuff/Balrog
Merge branch 'master' of github.com:emhuff/Balrog
Updated cosmos catalog to contain correct CMC entries.