Bump dep versions and more merging from flickr-sync
Refactor ORM, yet again, to use one of a folder's photo as the set's primary/cover photo.
More merge clarification notes
2.0.1