RFD 26 various updates
RFD 26 various updates

davepacheco/rfd,joyent/rfd,davepacheco/rfd,davepacheco/rfd,joyent/rfd,joyent/rfd,melloc/rfd,melloc/rfd,joyent/rfd,davepacheco/rfd,davepacheco/rfd,melloc/rfd