Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  dot/fonts.conf: If `Geneva' is requested, supply `FreeSans'.
  el/dot-emacs.el: Use define-derived-mode to make C# mode.
  el/dot-emacs.el: Org-mode hacking to use Strayman class.
  dot/bash_profile: Read bashrc if it's been lost.
  dot/e16-bindings: Add binding to show menu list.

diff --cc dot/fonts.conf
Simple merge

diff --cc el/dot-emacs.el
Simple merge