Merged ericchaves Restify-oriented changes.