Update from restclient to napping

Also some improvements to output formatting