Re-organize into a formal NodeInfo object.

Hello @azulus, 

Please review the following commits I made in branch 'nick-when-6'.

967d1b757ff6efe6420beeaa5dd20fb95bd6290c (2013-05-31 19:20:03 -0400)
Re-organize into a formal NodeInfo object. 

R=@azulus