Ignore .envrc file for direnv settings
convert the drop zones so that the edit form works and the multi new form works.
Merge branch 'master' of https://github.com/ndlib/honeycomb

# By Robert Fox
# Via Robert Fox
* 'master' of https://github.com/ndlib/honeycomb:
  Ignore .envrc file for direnv settings
require the image.
Add initial test for collection management
Rework item controller specs to comply with Rspec 3.x
Add show method
Bundle install
Add feature specs for the creation of collections
Add partial and decorator for error messages
Add helper method for error display
Change collections form partial so that it uses new error display method
Merge branch 'collections_work' of https://github.com/ndlib/honeycomb into collections_work

Conflicts:
	spec/features/collection_management_spec.rb