Revert "core: don't delete state data if id=nil [GH-2201]"

This reverts commit 1a780bf5b2.

Conflicts:
	CHANGELOG.md

CHANGELOG.md

@@ -3,6 +3,7 @@
 BUG FIXES:
 
   - core: Fix issues with dynamic linker not finding symbols on OS X. [GH-2219]
+  - core: Properly clean up machine directories on destroy. [GH-2223]
 
 ## 1.3.2 (September 17, 2013)
 

lib/vagrant/machine.rb

@@ -207,6 +207,16 @@ module Vagrant
       else
         # Delete the file, since the machine is now destroyed
         id_file.delete if id_file.file?
+
+        # Delete the entire data directory contents since all state
+        # associated with the VM is now gone.
+        @data_dir.children.each do |child|
+          begin
+            child.rmtree
+          rescue Errno::EACCES
+            @logger.info("EACCESS deleting file: #{child}")
+          end
+        end
       end
 
       # Store the ID locally