diff --git a/Vagrantfile b/Vagrantfile
index 3ba8f0f135..d0e96206eb 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,43 +1,24 @@
-require 'yaml'
+Vagrant.require_version ">= 1.5"
 
-unless Vagrant.has_plugin?("vagrant-hostsupdater")
-  raise 'vagrant-hostmanager is not installed! please run "vagrant plugin install vagrant-hostsupdater'
+unless Vagrant.has_plugin?('vagrant-hostmanager')
+    raise "vagrant-hostmanager is not installed! Please run\n  vagrant plugin install vagrant-hostmanager\n\n"
 end
 $root = File.dirname(File.expand_path(__FILE__))
 
-root = File.dirname(File.expand_path(__FILE__))
+# Check to determine whether we're on a windows or linux/os-x host,
+# later on we use this to launch ansible in the supported way
+# source: https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+def which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable? exe
+        }
+    end
+    return nil
+end
 
-Vagrant.configure("2") do |config|
-    Dir.glob(root+"/resources/vagrant/vms/**/puphpet/config.yaml").each do|f|
-        dir = File.dirname(File.expand_path(f+"/.."))
-        base_path = dir
-        configValues = YAML.load_file(f)
-        data = configValues['vagrantfile-local']
-
-        # Force vagrant folder in nfs mode. Windows users should comment following line
-        config.vm.synced_folder ".", "/vagrant", type: "nfs"
-
-        config.vm.define "vm-#{data['name']}" do |node|
-            node.vm.box = "#{data['vm']['box']}"
-            node.vm.box_url = "#{data['vm']['box_url']}"
-
-            if data['vm']['hostname'].to_s.strip.length != 0
-                node.vm.hostname = "#{data['vm']['hostname']}"
-            end
-
-            node.vm.provider :virtualbox do |vb|
-                vb.name = "#{data['name']}"
-            end
-
-            if data['vm']['network']['private_network'].to_s != ''
-                node.vm.network :private_network, ip: "#{data['vm']['network']['private_network']}"
-            end
-
-            data['vm']['network']['forwarded_port'].each do |i, port|
-            
-            if port['guest'] != '' && port['host'] != ''
-              node.vm.network :forwarded_port, guest: port['guest'].to_i, host: port['host'].to_i
-=======
 def config_net(config)
     config.hostmanager.aliases = [
         $hostname + ".vb",
@@ -60,218 +41,65 @@ def config_net(config)
         config.hostmanager.ip_resolver = proc do |vm, resolving_vm|
             if vm.id
                 `VBoxManage guestproperty get #{vm.id} "/VirtualBox/GuestInfo/Net/1/V4/IP"`.split()[1]
->>>>>>> f1dccd0... WIP ansible
             end
         end
     end
 end
 
-<<<<<<< HEAD
-        if Vagrant.has_plugin?('vagrant-hostsupdater')
-            hosts = Array.new()
-=======
 # By default, the name of the VM is the project's directory name
 $hostname = File.basename($root).downcase
->>>>>>> f1dccd0... WIP ansible
 
-            if !configValues['apache']['install'].nil? &&
-                configValues['apache']['install'].to_i == 1 &&
-                    configValues['apache']['vhosts'].is_a?(Hash)
-                    configValues['apache']['vhosts'].each do |i, vhost|
-                    hosts.push(vhost['servername'])
-            
-                if vhost['serveraliases'].is_a?(Array)
-                vhost['serveraliases'].each do |vhost_alias|
-                hosts.push(vhost_alias)
-                end
-                end
-                end
-            elsif !configValues['nginx']['install'].nil? &&
-                   configValues['nginx']['install'].to_i == 1 &&
-                   configValues['nginx']['vhosts'].is_a?(Hash)
-              configValues['nginx']['vhosts'].each do |i, vhost|
-                hosts.push(vhost['server_name'])
+Vagrant.configure("2") do |config|
 
-<<<<<<< HEAD
-                if vhost['server_aliases'].is_a?(Array)
-                  vhost['server_aliases'].each do |x, vhost_alias|
-                    hosts.push(vhost_alias)
-                  end
-                end
-              end
-            end
+    # Configure hostmanager
+    config.hostmanager.enabled = true
+    config.hostmanager.manage_host = true
+    config.hostmanager.ignore_private_ip = false
+    config.hostmanager.include_offline = true
 
-            if hosts.any?
-              contents = File.open("#{dir}/puphpet/shell/hostsupdater-notice.txt", 'r'){ |file| file.read }
-              puts "\n\033[34m#{contents}\033[0m\n"
+    config.vm.hostname = $hostname
 
-              if node.vm.hostname.to_s.strip.length == 0
-                node.vm.hostname = 'puphpet-dev-machine'
-              end
-
-              node.hostsupdater.aliases = hosts
-            end
-            end
-
-            data['vm']['synced_folder'].each do |i, folder|
-            if folder['source'] == ''
-                folder['source'] = root
-            end
-            if folder['source'] != '' && folder['target'] != ''
-              if folder['sync_type'] == 'nfs'
-                node.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'fsc']
-              elsif folder['sync_type'] == 'smb'
-                node.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: "smb"
-              elsif folder['sync_type'] == 'rsync'
-                rsync_args = !folder['rsync']['args'].nil? ? folder['rsync']['args'] : ["--verbose", "--archive", "--delete", "-z"]
-                rsync_auto = !folder['rsync']['auto'].nil? ? folder['rsync']['auto'] : true
-                rsync_exclude = !folder['rsync']['exclude'].nil? ? folder['rsync']['exclude'] : [".vagrant/"]
-
-                node.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}",
-                    rsync__args: rsync_args, rsync__exclude: rsync_exclude, rsync__auto: rsync_auto, type: "rsync"
-              else
-                node.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}",
-                  group: 'www-data', owner: 'www-data', mount_options: ["dmode=775", "fmode=764"]
-              end
-            end
-            end
-
-            node.vm.usable_port_range = (10200..10500)
-
-            if data['vm']['chosen_provider'].empty? || data['vm']['chosen_provider'] == "virtualbox"
-            ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-
-            node.vm.provider :virtualbox do |virtualbox|
-              data['vm']['provider']['virtualbox']['modifyvm'].each do |key, value|
-                if key == "memory"
-                  next
-                end
-
-                if key == "natdnshostresolver1"
-                  value = value ? "on" : "off"
-                end
-
-                virtualbox.customize ["modifyvm", :id, "--#{key}", "#{value}"]
-              end
-
-              virtualbox.customize ["modifyvm", :id, "--memory", "#{data['vm']['memory']}"]
-
-              if data['vm']['hostname'].to_s.strip.length != 0
-                virtualbox.customize ["modifyvm", :id, "--name", node.vm.hostname]
-              end
-            end
-            end
-
-            if data['vm']['chosen_provider'] == "vmware_fusion" || data['vm']['chosen_provider'] == "vmware_workstation"
-            ENV['VAGRANT_DEFAULT_PROVIDER'] = (data['vm']['chosen_provider'] == "vmware_fusion") ? "vmware_fusion" : "vmware_workstation"
-
-            node.vm.provider "vmware_fusion" do |v|
-              data['vm']['provider']['vmware'].each do |key, value|
-                if key == "memsize"
-                  next
-                end
-
-                v.vmx["#{key}"] = "#{value}"
-              end
-
-              v.vmx["memsize"] = "#{data['vm']['memory']}"
-
-              if data['vm']['hostname'].to_s.strip.length != 0
-                v.vmx["displayName"] = node.vm.hostname
-              end
-            end
-            end
-
-            if data['vm']['chosen_provider'] == "parallels"
-            ENV['VAGRANT_DEFAULT_PROVIDER'] = "parallels"
-
-            node.vm.provider "parallels" do |v|
-                data['vm']['provider']['parallels'].each do |key, value|
-                if key == "memsize"
-                    next
-                end
-                
-                v.customize ["set", :id, "--#{key}", "#{value}"]
-            end
-                
-            v.memory = "#{data['vm']['memory']}"
-            v.cpus = "#{data['vm']['cpus']}"
-
-            if data['vm']['hostname'].to_s.strip.length != 0
-                v.name = node.vm.hostname
-                end
-                end
-            end
-
-            ssh_username = !data['ssh']['username'].nil? ? data['ssh']['username'] : "vagrant"
-
-            node.vm.provision "shell" do |s|
-                s.path = "#{base_path}/puphpet/shell/initial-setup.sh"
-                s.args = "/vagrant/resources/vagrant/vms/#{data['name']}/puphpet"
-            end
-
-            node.vm.provision "shell" do |kg|
-                kg.path = "#{base_path}/puphpet/shell/ssh-keygen.sh"
-                kg.args = "#{ssh_username}"
-            end
-            
-            node.vm.provision :shell, :path => "#{base_path}/puphpet/shell/update-puppet.sh"
-
-            node.vm.provision :puppet do |puppet|
-                puppet.facter = {
-                    "ssh_username"     => "#{ssh_username}",
-                    "provisioner_type" => ENV['VAGRANT_DEFAULT_PROVIDER'],
-                    "vm_target_key"    => 'vagrantfile-local',
-                }
-<<<<<<< HEAD
-                puppet.manifests_path = "#{data['vm']['provision']['puppet']['manifests_path']}"
-                puppet.manifest_file = "#{data['vm']['provision']['puppet']['manifest_file']}"
-                puppet.module_path = "#{data['vm']['provision']['puppet']['module_path']}"
-
-                if !data['vm']['provision']['puppet']['options'].empty?
-                      puppet.options = data['vm']['provision']['puppet']['options']
-                end
-            end
-
-            node.vm.provision :shell do |s|
-                s.path = "#{base_path}/puphpet/shell/execute-files.sh"
-                s.args = ["exec-once", "exec-always"]
-            end
-
-            node.vm.provision :shell, run: "always" do |s|
-                s.path = "#{base_path}/puphpet/shell/execute-files.sh"
-                s.args = ["startup-once", "startup-always"]
-            end
-
-            node.vm.provision :shell, :path => "#{base_path}/puphpet/shell/important-notices.sh"
-
-            if !data['ssh']['host'].nil?
-                node.ssh.host = "#{data['ssh']['host']}"
-            end
-            if !data['ssh']['port'].nil?
-                node.ssh.port = "#{data['ssh']['port']}"
-            end
-            if !data['ssh']['username'].nil?
-                node.ssh.username = "#{data['ssh']['username']}"
-            end
-            if !data['ssh']['guest_port'].nil?
-                node.ssh.guest_port = data['ssh']['guest_port']
-            end
-            if !data['ssh']['shell'].nil?
-                node.ssh.shell = "#{data['ssh']['shell']}"
-            end
-            if !data['ssh']['keep_alive'].nil?
-                node.ssh.keep_alive = data['ssh']['keep_alive']
-            end
-            if !data['ssh']['forward_agent'].nil?
-                node.ssh.forward_agent = data['ssh']['forward_agent']
-            end
-            if !data['ssh']['forward_x11'].nil?
-                node.ssh.forward_x11 = data['ssh']['forward_x11']
-            end
-            if !data['vagrant']['host'].nil?
-                node.vagrant.host = data['vagrant']['host'].gsub(":", "").intern
-            end
-        end
+    config.vm.provider :virtualbox do |v|
+        v.name = $hostname
+        v.customize [
+            "modifyvm", :id,
+            "--name", $hostname,
+            "--memory", 4096,
+            "--cpus", 2,
+        ]
     end
+
+    config.vm.box = "ubuntu/trusty64"
+    
+    config.ssh.forward_agent = true
+    config_net(config)
+
+    # If ansible is in your path it will provision from your HOST machine
+    # If ansible is not found in the path it will be instaled in the VM and provisioned from there
+    if which('ansible-playbook')
+        config.vm.provision "ansible" do |ansible|
+            ansible.playbook = "resources/ansible/playbook.yml"
+            ansible.limit = 'all'
+            ansible.verbose = 'v'
+            ansible.extra_vars = {
+                hostname: $hostname,
+                postfix: {
+                    postfix_domain: $hostname + ".vb"
+                }
+            }
+        end
+
+        config.vm.provision "ansible", run: "always" do |ansible|
+            ansible.playbook = "resources/ansible/playbook-always.yml"
+            ansible.limit = 'all'
+            ansible.extra_vars = {
+                hostname: $hostname
+            }
+        end
+    else
+        config.vm.provision :shell, path: "resources/ansible/windows.sh", args: ["default"]
+        config.vm.provision :shell, run: "always", path: "resources/ansible/windows-always.sh", args: ["default"]
+    end
+
+    config.vm.synced_folder "./", "/vagrant", type: "nfs"
 end
diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml
old mode 100755
new mode 100644
diff --git a/resources/ansible/roles/nginx/handlers/main.yml b/resources/ansible/roles/nginx/handlers/main.yml
index 1899c9cc09..53f6b3788b 100644
--- a/resources/ansible/roles/nginx/handlers/main.yml
+++ b/resources/ansible/roles/nginx/handlers/main.yml
@@ -1,3 +1,4 @@
 ---
 - name: restart nginx
-  service: name=nginx enabled=yes state=restarted
\ No newline at end of file
+  service: name=nginx enabled=yes state=restarted
+