Clean up provisioning script

Removed merge conflict markers, revised ruby installs and removed ipxe patching - not needed for VirtualBox provisioning.