diff --git a/zprofile b/zprofile
index 19cddb8a..de51d551 100644
--- a/zprofile
+++ b/zprofile
@@ -41,7 +41,6 @@ typeset -gU cdpath fpath mailpath path
 
 # Set the list of directories that Zsh searches for programs.
 path=(
-  $HOME/.dotfiles/bin
   /usr/local/{bin,sbin}
   /usr/{bin,sbin}
   /{bin,sbin}
diff --git a/zshrc b/zshrc
index 64966dd1..7cd798b2 100644
--- a/zshrc
+++ b/zshrc
@@ -2,8 +2,6 @@
 # By Henrik Lissner <henrik@lissner.net>
 # Uses zgen to manage plugins
 
-export PATH="$HOME/.rbenv/bin:$HOME/.pyenv/bin:$PATH"
-
 source ~/.zsh/functions.zsh
 source ~/.zsh/aliases.zsh
 
@@ -31,11 +29,22 @@ if [ -z "$EMACS" ]; then
     cache fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install
 fi
 
+export DOCKER_HOST=tcp://server:4243
+
+export GOPATH=$HOME/Dropbox/go
+export ANDROID_HOME=/usr/local/opt/android-sdk
+export ANDROID_SDK=/usr/local/Cellar/android-sdk/24.2
+
+path=(
+    $HOME/.dotfiles/bin
+    $HOME/.{rb,py}env/bin
+    $GOPATH/bin
+    $ANDROID_HOME/platform-tools
+    $ANDROID_HOME/tools
+    $path
+)
+
 cache rbenv init - --no-rehash
 cache pyenv init - --no-rehash
 
-export ANDROID_HOME=/usr/local/opt/android-sdk
-export ANDROID_SDK=/usr/local/Cellar/android-sdk/24.2
-export PATH=$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH
-
 # Done!