adding proxy server middleware until changes are incorporated more elegantly into punch
Merge commit 'ea546b770a775f9e4d52a91855fdff18e12c9045'