Merge branch 'master' of https://github.com/potatolondon/djangoappengine-1-4
Undo allocation, it makes appengine cry