Add "network-manager-gnome" to the desktop-setup installation
Merge branch 'master' into comigo
update fluxbox keys shortcuts and vim snippets