Fix #index name collision (duh!)
Merge branch 'master' into feature/searchable
Fix spec for invalid attribute 'name'
Fix hash merge for #property(mongoid_opts)
Merge branch 'feature/searchable'