more zshrc cleanup

zshrc

@@ -38,7 +38,6 @@ plugins=(
 )
 
 source $ZSH/oh-my-zsh.sh
-[[ -e ~/.zshenv ]] && source ~/.zshenv
 
 unsetopt correct_all
 bindkey '^R' history-incremental-search-backward
@@ -59,15 +58,6 @@ path=(
     /usr/local/games
 )
 
-#if [ -f ~/.gvm/scripts/gvm ] ; then
-    #source ~/.gvm/scripts/gvm
-    #gvm use go1.2
-    #if [ -f ~/src/gocode/src/.env ] ; then
-        #unset _GOCODE_DID_SETUP
-        #source ~/src/gocode/src/.env
-    #fi
-#fi
-
 eval "$(goenv init -)"
 export GOPATH="$HOME/gopath"
 
@@ -90,5 +80,7 @@ function load-ssh-agent() {
     source ~/.ssh/agent.out
 }
 
+[[ -e ~/.zshenv ]] && source ~/.zshenv
+
 # added by travis gem
 [[ -f ~/.travis/travis.sh ]] && source ~/.travis/travis.sh