cleaned up nova cookbook
fix merge conflicts