merging changes from micah

diff --cc src/monkeysphere-host
index 9eed3acb61382f6177e0afae7e496f0e71ebb7eb,3caa63d4ac18061537cb2a111fdcd16f7c91b34e..bf586169bf5a259199e5b3ddd657e9db6c664e66
--- 1/src/monkeysphere-host
--- 2/src/monkeysphere-server
+++ b/src/monkeysphere-host
@@@ -105,16 -115,17 +105,6 @@@ gpg_host() 
      return "$returnCode"
  }
  
- # check if user is root
- is_root() {
-     [ $(id -u 2>/dev/null) = '0' ]
- }
 -# function to interact with the authentication gnupg keyring
 -# FIXME: this function requires basically accepts only a single
 -# argument because of problems with quote expansion.  this needs to be
 -# fixed/improved.
 -gpg_authentication() {
 -    GNUPGHOME="$GNUPGHOME_AUTHENTICATION"
 -    export GNUPGHOME
--
- # check that user is root, for functions that require root access
- check_user() {
-     is_root || failure "You must be root to run this command."
 -    su_monkeysphere_user "gpg $@"
--}
--
  # output just key fingerprint
  fingerprint_server_key() {
      # set the pipefail option so functions fails if can't read sec key
@@@ -781,8 -1118,11 +763,7 @@@ case $COMMAND i
        revoke_key "$@"
        ;;
  
 -    'show-key'|'show'|'s')
 -      show_server_key
 -      ;;
 -
      'publish-key'|'publish'|'p')
-       check_user
        check_host_keyring
        publish_server_key
        ;;