Merge remote-tracking branch 'crybaby'

* crybaby:
  dot/bashrc: Fix `rootly' to make a shell on demand.
  dot/emacs: Use `sudo' for local editing.
  Gnome hacking: Introduce a custom session file.

diff --cc dot/xinitrc
Simple merge

diff --cc setup
Simple merge