Cache backend using App Engine's memcache service
Merge pull request #45 from mattdoughty/master

Cache backend using App Engine's memcache service
added extra tests for cache backend
Set up logging for live environment.
Revert "Cache backend using App Engine's memcache service"

This reverts commit 093461b1696c1ffe9a2271943b991bed26237b29.
Make sure 'import memcache' imports the App Engine memcache library, makes the default Django memcached backend work
Merge branch 'setup-logging' of https://github.com/kirberich/djangae into kirberich-setup-logging

Conflicts:
	djangae/settings_base.py
Merge branch 'kirberich-setup-logging'
Make .only() work... sometimes
Implement a custom test runner, it does nothing yet, just putting it in place so we can start ignoring NotSupportedErrors somehow
Fix up memcache (damn you .gitignore). Fix isnull queries. Don't prep_save twice. Implement Count for QueryByKeys
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