Clean up some weird merge glitch I caused..
Remove empty netaddr directory.
zpg.json No longer needed.
Remove user ability to specify nova API version.  That is not necessary and is kind of a dumb thing for me to have done.
Merged changes, re-added netaddr (needed for keystoneclient)