Merge branch 'islandora-dev-with-base'

Conflicts:
	Vagrantfile

.gitignore

@@ -1,3 +1,4 @@
 .vagrant
 downloads
 scripts/custom.sh
+package.box

Vagrantfile

@@ -17,7 +17,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = "islandora"
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ruebot/islandora-base"
 
   config.vm.network :forwarded_port, guest: 8080, host: 8080 # Tomcat
   config.vm.network :forwarded_port, guest: 3306, host: 3306 # MySQL
@@ -28,31 +28,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     vb.customize ["modifyvm", :id, "--cpus", $cpus]
   end
 
-  config.vm.provider "vmware_fusion" do |v, override|
-    override.vm.box = "phusion/ubuntu-14.04-amd64"
-    override.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/ubuntu-14.04-amd64-vmwarefusion.box"
-
-    v.vmx["memsize"] = $memory
-    v.vmx["numvcpus"] = $cpus
-  end
-
   shared_dir = "/vagrant"
 
-  config.vm.provision :shell, inline: "sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile", :privileged =>false
-  config.vm.provision :shell, path: "./scripts/bootstrap.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/devtools.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/fits.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/fcrepo.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/djatoka.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/solr.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/gsearch.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/drupal.sh", :args => shared_dir
   config.vm.provision :shell, path: "./scripts/islandora_modules.sh", :args => shared_dir, :privileged => false
   config.vm.provision :shell, path: "./scripts/islandora_libraries.sh", :args => shared_dir, :privileged => false
-  config.vm.provision :shell, path: "./scripts/tesseract.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/ffmpeg.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/warctools.sh", :args => shared_dir
-  config.vm.provision :shell, path: "./scripts/sleuthkit.sh", :args => shared_dir
   if File.exist?("./scripts/custom.sh") then
     config.vm.provision :shell, path: "./scripts/custom.sh", :args => shared_dir
   end