Fix up primary key handling
Merge branch 'master' of https://github.com/lukebpotato/djangae
Fix some queries, prove that OR queries are broken
Merge branch 'master' of https://github.com/lukebpotato/djangae

Conflicts:
	djangae/tests.py