Merge pull request #6 from dvazquez1027/master

Cleanup to correct some merge problems
Add uploadDate field to collections when they're inserted or updated.