# Always prefer Ruby 1.9 in jRuby
export JRUBY_OPTS='--1.9'

# Set vim to be primary editor
export EDITOR='vi'

# Customize to your needs...
export PATH=/usr/local/bin:$PATH
export PATH=/usr/local/sbin:$PATH
export PATH=$HOME/bin:$PATH
export PATH=$HOME/.rbenv/bin:$PATH

# if [[ `uname` == 'Darwin' ]]; then
#   export DYLD_LIBRARY_PATH=/usr/local/mysql/lib:$DYLD_LIBRARY_PATH
#   export PATH=/Applications/MAMP/Library/bin:$PATH
#   export PATH=/Applications/MAMP/bin/php/php5.2.17/bin:$PATH
#   export PATH=/Applications/MAMP/bin/php/php5.3.6/bin:$PATH
# fi

# Always prefer Ruby 1.9 in jRuby
export JRUBY_OPTS='--1.9'

# Prefer Vim when using `bundle open`
export BUNDLER_EDITOR='vi'

# Customize to your needs...
export PATH=/usr/local/bin:$PATH
export PATH=/usr/local/sbin:$PATH
export PATH=$HOME/bin:$PATH
export PATH=$HOME/.rbenv/bin:$PATH

# if [[ `uname` == 'Darwin' ]]; then
#   export DYLD_LIBRARY_PATH=/usr/local/mysql/lib:$DYLD_LIBRARY_PATH
#   export PATH=/Applications/MAMP/Library/bin:$PATH
#   export PATH=/Applications/MAMP/bin/php/php5.2.17/bin:$PATH
#   export PATH=/Applications/MAMP/bin/php/php5.3.6/bin:$PATH
# fi

--- 
+++ 
@@ -1,8 +1,8 @@
 # Always prefer Ruby 1.9 in jRuby
 export JRUBY_OPTS='--1.9'
 
-# Prefer Vim when using `bundle open`
-export BUNDLER_EDITOR='vi'
+# Set vim to be primary editor
+export EDITOR='vi'
 
 # Customize to your needs...
 export PATH=/usr/local/bin:$PATH
Use vim as zsh and bash EDITOR
