diff --git a/Vagrantfile b/Vagrantfile
index 0bc299aaf8..1b6f423289 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,23 +1,39 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+require 'socket'
+
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "precise64"
 
-  config.vm.hostname = "pdal-development"
+  config.vm.hostname = "pdal-vagrant"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-
+  config.vm.host_name = "pdal-vagrant"
+  
   config.vm.network :forwarded_port, guest: 80, host: 8080
 
   config.vm.provider :virtualbox do |vb|
-     vb.customize ["modifyvm", :id, "--memory", "512"]
-     vb.customize ["modifyvm", :id, "--cpus", "1"]   
+     vb.customize ["modifyvm", :id, "--memory", "1024"]
+     vb.customize ["modifyvm", :id, "--cpus", "2"]   
      vb.customize ["modifyvm", :id, "--ioapic", "on"]
+     vb.name = "pdal-vagrant"
    end  
 
+
+  if RUBY_PLATFORM.include? "darwin"
+    config.vm.network "private_network", ip: "192.168.50.4"
+    config.vm.synced_folder ".", "/vagrant", nfs: true
+    
+    if Socket.gethostname.include? "pyro" # Howard's machine
+     config.vm.synced_folder "/Users/hobu/dev/git/pointcloud", "/pointcloud", nfs: true
+    end
+  end
+  
+  
+
   ppaRepos = [
 	  "ppa:ubuntugis/ppa",
     "ppa:apokluda/boost1.53"