diff --git a/lib/git.zsh b/lib/git.zsh
index ce4de5598..f04343650 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -52,7 +52,9 @@ git_prompt_status() {
   if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index e98bb4b46..f005700ff 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -2,6 +2,7 @@ alias be="bundle exec"
 alias bi="bundle install"
 alias bl="bundle list"
 alias bu="bundle update"
+alias bp="bundle package"
 
 # The following is based on https://github.com/gma/bundler-exec
 
diff --git a/plugins/gas/_gas b/plugins/gas/_gas
new file mode 100644
index 000000000..befdc9459
--- /dev/null
+++ b/plugins/gas/_gas
@@ -0,0 +1,34 @@
+#compdef gas
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+	'(- 1 *)'{-v,--version}'[display version information]' \
+	'(-h|--help)'{-h,--help}'[show help information]' \
+	'1: :->cmds' \
+	'*: :->args' && ret=0
+
+case $state in
+	cmds)
+		cmds=(
+            "version:Prints Gas's version"
+            "use:Uses author"
+            "show:Shows your current user"
+            "list:Lists your authors"
+            "import:Imports current user to gasconfig"
+            "help:Describe available tasks or one specific task"
+            "delete:Deletes author"
+            "add:Adds author to gasconfig"
+        )
+		_describe -t commands 'gas command' cmds && ret=0
+		;;
+	args)
+		case $line[1] in
+			(use|delete)
+				_values -S , 'authors' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
+				;;
+		esac
+		;;
+esac
+
+return ret
diff --git a/README b/plugins/history-substring-search/README
similarity index 100%
rename from README
rename to plugins/history-substring-search/README
diff --git a/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh
similarity index 100%
rename from history-substring-search.plugin.zsh
rename to plugins/history-substring-search/history-substring-search.plugin.zsh
diff --git a/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
similarity index 100%
rename from history-substring-search.zsh
rename to plugins/history-substring-search/history-substring-search.zsh
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 86050227d..53a8a513a 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,5 +1,5 @@
 function svn_prompt_info {
-    if [[ -d .svn ]]; then
+    if [ in_svn ]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
     fi
@@ -28,7 +28,7 @@ function svn_get_rev_nr {
 
 function svn_dirty_choose {
     if [ in_svn ]; then
-        s=$(svn status 2>/dev/null)
+        s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
         if [ $s ]; then 
             echo $1
         else