Upgrade to gitkit-v2 and webapp2