fixing initial route when using hash_fallback.
passing options from Collection.upsert to Collection.find_by_id (which allows us to specify {allow_cid: true} if wanted)
Merge branch 'master' into gh-pages
really minor change to upsert, version bump