Remove useless ubuntu empty folders in $HOME
Moved setup-ubuntu inside setup.sh
Merge branch 'master' into imo-dell