Restore direct use of vagrant.yml
Roll in apt up tasks and pre-task packages
Update to use vagrant user for everything