Clean up provisioning script

Removed merge conflict markers, revised ruby installs and removed ipxe patching - not needed for VirtualBox provisioning.
Merge pull request #7 from ap1kenobi/fb/fix_script

Fixes #5, also fixes #6