Updates for desktop

Minor updates to bashrc: using screenkey, some new aliases.

Major update to setup_new_machine: avoid disabling disk services if
they're needed, handle arch suffix for flash-plugin, better output.