RFD 78 update according to latest code changes
RFD 78 update according to latest code changes

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