Conflicts: README.md couchrest.gemspec lib/couchrest.rb lib/couchrest/mixins/properties.rb
also avoided CONSTANTS warnings, cleaned up the attachment specs, added missing fixtures