don't stomp on collection.query when constructing URLs
Fix broken patch.
Merge branch 'patch-2'

* patch-2:
  Fix broken patch.
  don't stomp on collection.query when constructing URLs
Release 0.2.14