Merge branch 'ubuntu' of github.com:nrgaway/qubes-builder into ubuntu