diff --git a/bash/aliases b/bash/aliases
index 890559d54e..9a06cef182 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -1,6 +1,3 @@
-#alias vim='mvim -v'
-#alias vi='mvim -v'
-
 # mate
 alias matew='mate -w'
 
diff --git a/bash/paths b/bash/paths
index f5f2681a9a..698e5778ca 100644
--- a/bash/paths
+++ b/bash/paths
@@ -2,12 +2,12 @@ export PATH="~/.bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/loc
 export PATH="/opt/local/bin:$PATH"
 export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
 
-export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
-setjdk() {
-  export JAVA_HOME=$(/usr/libexec/java_home -v $1)
-}
+#export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
+#setjdk() {
+  #export JAVA_HOME=$(/usr/libexec/java_home -v $1)
+#}
 
-export PATH="${JAVA_HOME}/bin:$PATH"
+#export PATH="${JAVA_HOME}/bin:$PATH"
 export PATH="/Volumes/RubyEncoder/RubyEncoder.app/Contents/MacOS/:$PATH"
 
 export GOPATH="$HOME/.go"
diff --git a/gitconfig b/gitconfig
index cb2b2b11d8..2e2c6e1045 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,7 +10,7 @@
 	branch = auto
 [core]
 	excludesfile = /Users/jordi/.gitignore
-	editor = mvim -vf
+	editor = vim -vf
 [apply]
 	whitespace = nowarn
 [push]