Merge remote branch 'dkg/master'

Conflicts:
	tests/basic

diff --cc tests/basic
index 8cf093320a1cdeaa5a8aa1bf328269765f1a7970,f808387ec9ccb65b93cf9bbe14b6829c131cfa42..15afa77fe1dd4bf7817395f61930677e0b7e6e1a
--- 1/tests/basic
--- 2/tests/basic
+++ b/tests/basic
@@@ -272,8 -270,8 +272,8 @@@ monkeysphere-host set-expire 
  echo
  echo "##################################################"
  echo "### certifying server host key..."
 -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import
 +< "$HOST_KEY_FILE" gpgadmin --import
- echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+ echo y | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID"
  
  # FIXME: add revoker?
  
@@@ -501,10 -505,10 +507,10 @@@ echo "### ssh connection test directly 
  target_hostname=testhost2 ssh_test 255
  echo
  echo "##################################################"
- echo "### add hostname, certify by admin, import by user..."
- monkeysphere-host add-hostname ssh://testhost2
+ echo "### add servicename, certify by admin, import by user..."
+ monkeysphere-host add-servicename ssh://testhost2
 -< "$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg gpgadmin --import
 +<"$HOST_KEY_FILE" gpgadmin --import
- printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
+ printf "y\ny\n" | gpgadmin --command-fd 0 --sign-key "$SSHHOSTKEYID"
  
  echo
  echo "##################################################"
@@@ -523,8 -527,8 +529,8 @@@ target_hostname=testhost2 ssh_tes
  echo
  echo "##################################################"
  echo "### ssh connection test for failure with 'testhost2' revoked..."
- monkeysphere-host revoke-hostname ssh://testhost2
+ monkeysphere-host revoke-servicename ssh://testhost2
 -gpg --import <"$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg
 +gpg --import <"$HOST_KEY_FILE"
  gpg --check-trustdb
  target_hostname=testhost2 ssh_test 255