better handling for storage backends
Merge branch 'develop' of github.com:plants/sesame into develop