Merge branch 'master' of github.com:potatolondon/djangae-testapp
Update djangae, disable the file_uploads tests for now
Update djangae