Merge commit 'jrollins/master'

diff --combined src/monkeysphere-host
index 6136399643eb70e46da8e19df0b1485d49e821a8,da7fc9cec0da8ab7d66607c2cc278c84e2c9e03c..507b47f8f73eabfd6a62e7d9feaf4d53d12bca84
--- 1/src/monkeysphere-host
--- 2/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@@ -103,7 -103,7 +103,7 @@@ update_gpg_pub_file() 
  load_fingerprint() {
      if [ -f "$HOST_KEY_FILE" ] ; then
        HOST_FINGERPRINT=$( \
 -          (FUBAR=$(mktemp -d) && export GNUPGHOME="$FUBAR" \
 +          (FUBAR=$(msmktempdir) && export GNUPGHOME="$FUBAR" \
            && gpg --quiet --import \
            && gpg --quiet --list-keys --with-colons --with-fingerprint \
            && rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
@@@ -242,6 -242,7 +242,7 @@@ export PROMP
  export GNUPGHOME_HOST
  export GNUPGHOME
  export HOST_FINGERPRINT
+ export LOG_PREFIX
  
  # get subcommand
  COMMAND="$1"