Added JDBC and Redis stores, added multiple client features, switched to YAML configuration.
Fixed README merge conflicts.