Added configuration files for relstorage.
Fixed conflicts.