all tests pass, looks pretty
Update commands.py

wrong var
Start switching everything over to the new DNF code
Merge branch 'cnf-to-dnf' of https://github.com/lukebpotato/djangae into cnf-to-dnf

Conflicts:
	djangae/db/backends/appengine/commands.py
Remove hacky workaround for what is actually a flaw in the DNF code
Merge branch 'cnf-to-dnf' of https://github.com/chargrizzle/djangae into cnf-to-dnf
Try to handle the case where we have (A OR B) AND (C OR D)
Fix a bug where we add way too many AND levels
Fix more failing tests, now just one case to deal with in the DNF code
Remove an old function
Fix some failing tests
fixed the final bug, reduce when a node only has one child which is the same operation
Fix some failing tests
Implement support for __contains and __icontains, fix a bunch of issues with proxy models and custom PK fields
Merge branch 'cnf-to-dnf'
If someone tries to filter on pk__isnull=True then throw EmptyResultSet when the query is constructed, not when it's run
Make everything 'work' in Django 1.6
Remove some skip decorators from tests that now work
Fix dates() queries in 1.6
Add a comment