Add nova.conf files and cleanup a bit