Cleanup JSON server info format
Merge branch 'master' of github.com:vwc/buildout.6zu4
Update with new instance info