all specs passing
specs passing (except riak and sqlite) after merge