minor bugfix for username variable
Merge branch 'add-desktop-packages'