Added offset_key on query to allow datastore implementations that offset on key rather than index
Fix for test
Merge branch 'master' into dynamo
Merge branch 'dynamo' of https://github.com/RentMethod/datastore into dynamo

Conflicts:
	datastore/core/query.py