merging
Merging into Mac VM..Merge branch 'bugfix' of https://github.com/UCHIC/ODMToolsPython into bugfix
Merge branch 'bugfix' of https://github.com/UCHIC/ODMToolsPython into bugfix
resolved an additional mac issue dealing with the inability to find the user_config_dir