diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 95c7d384c8..a88dbaebbb 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -20,7 +20,7 @@ When you're ready to start working, boot the VM:
 vagrant up
 ```
 
-On Windows, it will prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow.
+Vagrant will prompt you for your admin password. This is so it can mount your local files inside the VM for an easy workflow.
 
 (The first time you do this, it will take a while as it downloads the VM image and installs it. Go grab a coffee.)
 
diff --git a/Vagrantfile b/Vagrantfile
index c723a86a32..870554d289 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -15,8 +15,8 @@ Vagrant::Config.run do |config|
   # them into the VM.
   config.ssh.forward_agent = true
 
-  # This setting gives the VM 512MB of MEMORIES instead of the default 384.
-  config.vm.customize ["modifyvm", :id, "--memory", 512]
+  # This setting gives the VM 1024MB of MEMORIES instead of the default 384.
+  config.vm.customize ["modifyvm", :id, "--memory", 1024]
 
   # This setting makes it so that network access from inside the vagrant guest
   # is able to resolve DNS using the hosts VPN connection.
@@ -25,5 +25,6 @@ Vagrant::Config.run do |config|
   config.vm.forward_port 3000, 4000
   config.vm.forward_port 1080, 4080 # Mailcatcher
 
-  config.vm.share_folder("v-root", "/vagrant", ".")
+  nfs_setting = RUBY_PLATFORM =~ /darwin/ ? true : false
+  config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
 end