Merged master to cmake-2

Vagrantfile

@@ -73,7 +73,7 @@ Vagrant.configure(2) do |config|
   # Enable provisioning with a shell script. Additional provisioners such as
   # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
   # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell", inline: <<-SHELL
+  config.vm.provision "shell", privileged: false, inline: <<-SHELL
     # Ensure we start in the Firmware folder
     echo "cd /Firmware" >> ~/.bashrc
     # Install software