Fixing json output for nginx.
Merge branch 'summer2014' of https://github.com/gustafa/firmament into summer2014