Merge branch 'master' of https://github.com/potatolondon/djangoappengine-1-4
Read the app.yaml version after pre-deploy, incase a pre-deploy command changes it