Update etap and remove obsolete files
Update etap and remove obsolete files

Update tests to use new etap, removed unused variable warnings, and
added a check-etap to the Makefile as a convenience

fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb