Merge branch 'release/1.2.0'

Author: Larry Gordon

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alf",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "engines": {
     "node": ">= 0.10.0"
   },

plugins/git/init.zsh

@@ -138,7 +138,9 @@ function _git-branch-delete() {
   done
   if [[ -n $has_option ]]; then
     shift
-    git branch | egrep "^  release" | xargs git branch -D
+    for branch in $(git branch | egrep "^[ ]+$@" | sed -e 's/ //g' | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"); do
+      git branch -D $branch
+    done
   else
     git branch -D $@
   fi

tools/post-update.zsh

@@ -28,9 +28,9 @@ _alf-fn-symlink-config() {
       ln -sf "$ALF_HOST/config" "$ALF_CONFIG"
     fi
     # Symlink our repos folder to our host
-    if [[ ! -d "$ADOTDIR" ]] || [[ -z $(readlink -f "$ADOTDIR" | grep "/cygdrive/z") ]]; then
-      ln -sf "$ALF_HOST/antigen" "$ADOTDIR"
-    fi
+    # if [[ ! -d "$ADOTDIR" ]] || [[ -z $(readlink -f "$ADOTDIR" | grep "/cygdrive/z") ]]; then
+    #   ln -sf "$ALF_HOST/antigen" "$ADOTDIR"
+    # fi
   fi
 }