Merge pull request #163 from WGBH/development

merge latest development sprint into master
Removes 'public/uploads' directory from revision.
Merge pull request #164 from WGBH/fix-uploads

Removes 'public/uploads' directory from revision.