Support querying a specific dataset copy (first cut).

http://soda-fountain/resource/{dataset}?[$$copy=latest|published|unpublished]
Standard practice for Github PRs is to merge in changes from master into your branch first, so that the merge can happen cleanly.  Alternative is that you can manually rebase + merge yourself, but then nobody else can review those changes.