initial carrierwave config for rackspace storage
initial carrierwave config for rackspace storage
cleanup
created initial features and step definitions for image upload; got image upload to rackspace working
more work on the tests
Finished Image upload tests
Merge branch 'master' of https://github.com/theodi/member-directory into feature-173-image-upload-storage

Conflicts:
	Gemfile
Changed image names
Changed tests to reflect rename
Update logo URLs in frontend and JSON

Resolves theodi/open-orgn-services#176
Added Rackspace connection details to env.example
Merge branch 'refs/heads/master' into feature-173-image-upload-storage
Moving Rackspace asset host and url details to .env

Means we can have different containers per environment.
Merge branch 'feature-173-image-upload-storage' of https://github.com/theodi/member-directory into feature-173-image-upload-storage
Merge pull request #70 from theodi/feature-173-image-upload-storage

Feature 173 image upload storage