Added nvpair.h back, pivot handles deltas (other than creates) now.
Merge branch 'catalog_history_tools' of github.com:pivie/cctools into catalog_history_tools