Separate output dir for ubuntu / ubuntu-vagrant template
Clean up windows scripts
Enable RDP in template