diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
old mode 100644
new mode 100755
diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 9217658fcf9a..5fe93b44ff43 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -1,7 +1,7 @@
 alias ec='/usr/local/Cellar/emacs/HEAD/Emacs.app/Contents/MacOS/bin/emacsclient'
 alias e=openemacs
 
-EDITOR='openemacs'
+EDITOR='/usr/local/Cellar/emacs/HEAD/Emacs.app/Contents/MacOS/bin/emacsclient'
 export EDITOR
 
 # configuration for emacs multi-term.el compatibility
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e12beec676e0..dd60e02d9cd9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -13,6 +13,8 @@ alias gba='git branch -a'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
 alias glg='git log --stat --max-count=5'
+alias gco='git checkout'
+alias gsv='git svn'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'