Merge commit 'jamie/master'

diff --cc doc/README
index 544465f27aed9f144c21f52681fa07235acebe09,13dd5af6295ec85843464d430cc3bfa7a1ffdc44..3be3c72c133c4c57ecd58d33b7484bafbfbbcd23
--- 1/doc/README
--- 2/doc/README
+++ b/doc/README
@@@ -132,12 -103,8 +106,9 @@@ key to your ssh agent by running
  
                monkeysphere subkey-to-ssh-agent
  
- You may want to add this command to your ~/.xsession file so it is run
- automatically everytime you login.
- 
  FIXME: using the key with a single session?
  
 +
  Miscellaneous
  -------------