diff --git a/etc/aur.conf b/etc/aur.conf
index e150fa8..311e27a 100644
--- a/etc/aur.conf
+++ b/etc/aur.conf
@@ -14,7 +14,9 @@ test -d "$SRCDEST" || mkdir -p "$SRCDEST" || exit 1
 export GNUPGHOME="$AURDIR/gnupg"
 
 test -d "$GNUPGHOME" || mkdir -p "$GNUPGHOME" && chmod go-w "$GNUPGHOME" || exit 1
-test -e "$GNUPGHOME/gpg.conf" || cat >"$GNUPGHOME/gpg.conf" <<EOF
+
+if ! test -e "$GNUPGHOME/gpg.conf"; then
+    cat >"$GNUPGHOME/gpg.conf" <<EOF
 no-greeting
 keyserver hkp://pool.sks-keyservers.net
 keyserver-options auto-key-retrieve
@@ -22,10 +24,20 @@ personal-cipher-preferences AES256 AES192 AES
 personal-digest-preferences SHA512 SHA384 SHA256
 cert-digest-algo SHA512
 EOF
-if [ "$?" -eq 0 ]; then
-    dirmngr </dev/null || exit 1
-else
-    echo "Failed to initialize aur.sh GnuPG keyring"
-    exit 1
+    if [ "$?" -eq 0 ]; then
+        dirmngr </dev/null >/dev/null || exit 1
+    else
+        echo "Failed to initialize aur.sh GnuPG keyring"
+        exit 1
+    fi
+fi
+
+# ABS
+if which asp >/dev/null 2>&1; then
+    ABSDEST="$AURDIR/ABS"
+    export ASPROOT="$ABSDEST/.asp"
+
+    test -d "$ABSDEST" || mkdir -p "$ABSDEST" || exit 1
+    test -d "$ASPROOT" || mkdir -p "$ASPROOT" || exit 1
 fi
 
diff --git a/zsh/prezto b/zsh/prezto
index c34098a..7227c4f 160000
--- a/zsh/prezto
+++ b/zsh/prezto
@@ -1 +1 @@
-Subproject commit c34098af20cafdf016f68f3e7f612ed60ca93aa1
+Subproject commit 7227c4f0bef5f8ae787c65150d7a7403394fff48
diff --git a/zsh/zshrc b/zsh/zshrc
index b7582bf..c9e5807 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -22,12 +22,15 @@ function gupf {
     set -e
     local ORIGIN=${1-origin}
     local UPSTREAM=${2-upstream}
+    local LBRANCH=`git symbolic-ref --short HEAD`
+    local OBRANCH=${3-$LBRANCH}
+    local UBRANCH=${4-$OBRANCH}
     git fetch $ORIGIN
     git fetch $UPSTREAM
-    git checkout $ORIGIN/master
+    git checkout $ORIGIN/$OBRANCH
     git checkout -b merge
-    git merge $UPSTREAM/master -m "merge upstream from `git ls-remote --get-url $UPSTREAM`"
-    git checkout master
+    git merge $UPSTREAM/$UBRANCH -m "merge upstream from `git ls-remote --get-url $UPSTREAM`"
+    git checkout $LBRANCH
     git rebase merge
     git branch -d merge
     )