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

diff --combined setup
index 39456f65e76f7eeec4b465de99970939b8bec8f5,a55fb164507f639fd228f28d582c3a7aab0e4c90..5f0ce0e32950bbaccf5c2fd26c4e1f1d2b12fbfe
--- 1/setup
--- 2/setup
+++ b/setup
@@@ -7,7 -7,7 +7,7 @@@ umask 00
  sub=
  mkdir -p $HOME$sub
  
 -: ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw}
 +: ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw/profile}
  
  export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
  
@@@ -67,11 -67,7 +67,11 @@@ f
  ### Install necessary things
  echo "Installing useful scripts..."
  
 -for script in lesspipe.sh start-ssh-agent svnwrap; do
 +scripts="
 +  lesspipe.sh start-ssh-agent svnwrap"
 +[ "$xstuff" ] && scripts="$scripts
 +  xrun"
 +for script in $scripts; do
    $echon "  $script:$echoc"
    found=
    for p in /bin /usr/bin /usr/local/bin $(echo $PATH | tr : ' '); do
@@@ -142,7 -138,7 +142,7 @@@ f
  
  ### Symlink the various dotfiles into place
  dotfiles=" 
-   bash_profile bash_logout bashrc
+   bash_profile bash_logout bashrc inputrc
    emacs emacs-calc 
    vm mailrc
    lisp-init.lisp:.cmucl-init.lisp