Merge commit 'dkg/master'

diff --cc doc/MonkeySpec
index 9ed072422811bba2738c515cee99f25ae25c8228,6ee278f20f38fd9e8d562180034599a629313f9f..fe5a0bf37318e181470be8d59043469c8f112e49
--- 1/doc/MonkeySpec
--- 2/doc/MonkeySpec
+++ b/doc/MonkeySpec
@@@ -41,10 -41,10 +41,10 @@@ server-side component
  * "howler": server gpg maintainer
    - generates gpg keys for the server
    - publishes server gpg keys
 -  - used to specify userids to trust for user authentication
 +  - used to specify keys to trust for user authentication
  
- * "tamarin": script to trigger rhesus during attempt to initiate
-   connection from client
+ * "tamarin": concept - how to trigger or schedule rhesus at admin defined 
+       points (e.g. via cron or during ssh connections).
  
  client-side components
  ----------------------