Setting up data refresh; First commit from new mac
Merge remote-tracking branch 'origin/master'