Nerfed Nick's formatting commit.  Merged it back in.