handle first time public/data existence
Merge remote-tracking branch 'upstream/master'

merging to get updates from Brendan that will create public/data folder if nonexistent
Slight corrections

 fix Uninitialized constant error