Updated demo server link

Updated the demo server link to the new server at
http://demo.geoshape.org

Author: ScottEvil

Vagrantfile

@@ -26,7 +26,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, :path => "scripts/install_rvm.sh",  :args => "stable"
   config.vm.provision :shell, :path => "scripts/install_ruby.sh", :args => "1.9.3"
   unless BERKSHELF
+<<<<<<< Updated upstream
     config.vm.provision :shell, :path => "scripts/geoshape-install.sh", :args => "vagrant release-1.2"
+=======
+    config.vm.provision :shell, :path => "scripts/geoshape-install.sh", :args => "vagrant master"
+>>>>>>> Stashed changes
   end
   config.vm.provision :shell, :inline => "gem install chef --version 11.10.4 --no-rdoc --no-ri --conservative"
 
@@ -40,6 +44,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # config.vm.network :forwarded_port, guest: 80, host: 8080
 
   # Create a private network, which allows host-only access to the machine
+<<<<<<< Updated upstream
   # using a specific IP. If you want to run multiple vms at once, you can change the .100 
   # running a private network eliminates the chances of conflicting with the network you are connected to. 
   # this is particularly useful when you want to run the vm on your laptop and endup being on various networks
@@ -48,6 +53,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Create a public network, obtain it's ip through dhcp and bridge it through host's en0
   # config.vm.network :public_network, :bridge => 'en0: Ethernet'
+=======
+  # using a specific IP.
+  config.vm.network :private_network, ip: "192.168.99.10", netmask: "255.255.255.0"
+
+  # Create a public network, obtain it's ip through dhcp and bridge it through host's en0
+  # config.vm.network :public_network, :bridge => 'en0: Ethernet', ip: "192.168.10.222", netmask: "255.255.255.0"
+  # config.vm.network :public_network, :bridge => 'en0: Ethernet'
+  #'en1: Wi-Fi (AirPort)'
+>>>>>>> Stashed changes
 
   # The following can be used to specify a static ip through the host's  en0. You can use other nework adaptors such as 'en1: Wi-Fi (AirPort)'  
   # config.vm.network :public_network, :bridge => 'en0: Ethernet', ip: "192.168.10.222", netmask: "255.255.255.255"
@@ -61,6 +75,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
   # config.vm.synced_folder "../data", "/vagrant_data"
+  config.vm.synced_folder "../MapLoom", "/MapLoom"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -70,7 +85,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # Don't boot with headless mode
     vb.gui = true
     # Use VBoxManage to customize the VM. For example to change memory:
-    vb.customize ["modifyvm", :id, "--memory", "2048"]
+    vb.customize ["modifyvm", :id, "--memory", "8000"]
     vb.customize ["modifyvm", :id, "--cpus", "2"]
   end
   #