From 3e4a20d919c9793c6055c681a403e6313e92b936 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 14 May 2010 23:25:12 -0700
Subject: [PATCH] Slight cosmetic changes to get things working with emacs
 highlighter and commenting

---
 lib/vagrant/environment.rb | 6 +++++-
 lib/vagrant/vm.rb          | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index 5aab4c005..632d290c2 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -23,7 +23,7 @@ module Vagrant
     #---------------------------------------------------------------
     # Class Methods
     #---------------------------------------------------------------
-    class <<self
+    class << self
       # Loads and returns an environment given a specific working
       # directory. If a working directory is not given, it will default
       # to the pwd.
@@ -203,11 +203,15 @@ module Vagrant
       # probably (read: should be) set on the VM attribute, so we do
       # nothing.
       return if vm_name
+
+      # Or, return if there is no root path set or the dotfile doesn't
+      # exist, since we can't do anything in that case anyways.
       return if !root_path || !File.file?(dotfile_path)
 
       # Empty out previously loaded vms
       vms.clear
 
+      # Open and parse the dotfile
       File.open(dotfile_path) do |f|
         data = { :__vagrant => f.read }
 
diff --git a/lib/vagrant/vm.rb b/lib/vagrant/vm.rb
index e3fa18985..25744163f 100644
--- a/lib/vagrant/vm.rb
+++ b/lib/vagrant/vm.rb
@@ -6,7 +6,7 @@ module Vagrant
     attr_reader :system
     attr_accessor :vm
 
-    class <<self
+    class << self
       # Finds a virtual machine by a given UUID and either returns
       # a Vagrant::VM object or returns nil.
       def find(uuid, env=nil, vm_name=nil)
@@ -27,12 +27,17 @@ module Vagrant
       @vm = opts[:vm]
 
       if !opts[:env].nil?
+        # We have an environment, so we create a new child environment
+        # specifically for this VM. This step will load any custom
+        # config and such.
         @env = Vagrant::Environment.new({
           :cwd => opts[:env].cwd,
           :parent => opts[:env],
           :vm_name => opts[:vm_name],
           :vm => self
         }).load!
+
+        # Load the associated system. 
         load_system!
       end
     end