Add C++ to nvm header. Tabs to spaces in nvm.c