Switching to app-engine 1.7