diff --git a/bash/aliases b/bash/aliases
index b37189a679..890559d54e 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -1,5 +1,5 @@
-alias vim='mvim -v'
-alias vi='mvim -v'
+#alias vim='mvim -v'
+#alias vi='mvim -v'
 
 # mate
 alias matew='mate -w'
diff --git a/bash/completions b/bash/completions
index ad63d01905..01e94fa870 100644
--- a/bash/completions
+++ b/bash/completions
@@ -2,3 +2,4 @@ source ~/.bash/completion_scripts/git_completion
 complete -C ~/.bash/completion_scripts/rake_completion -o default rake
 complete -C ~/.bash/completion_scripts/project_completion -o default c
 complete -C ~/.bash/completion_scripts/capistrano_completion -o default cap
+complete -C aws_completer aws
diff --git a/bash/config b/bash/config
index 66bf89b5c4..faafdda1a2 100644
--- a/bash/config
+++ b/bash/config
@@ -8,6 +8,7 @@ export CLICOLOR=1
 export LSCOLORS=bxfxcxdxbxegebabagacad
 
 export LESS="-R"
+export ANSIBLE_NOCOWS=1
 
 function __git_dirty {
   git diff --quiet HEAD &>/dev/null 
diff --git a/bash/paths b/bash/paths
index 896b5707fc..f5f2681a9a 100644
--- a/bash/paths
+++ b/bash/paths
@@ -1,7 +1,22 @@
-export PATH="~/bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/local/git/bin:$PATH"
+export PATH="~/.bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/local/git/bin:$PATH"
 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 PATH="${JAVA_HOME}/bin:$PATH"
+export PATH="/Volumes/RubyEncoder/RubyEncoder.app/Contents/MacOS/:$PATH"
+
+export GOPATH="$HOME/.go"
+
+[[ -f $HOME/.gemrc_local ]] && export GEMRC=$HOME/.gemrc_local
+
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
 
+export NVM_DIR="/Users/jordi/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
 
+export PATH="$HOME/.bin:$PATH"
diff --git a/bash/vars b/bash/vars
new file mode 100644
index 0000000000..c3f2fb3221
--- /dev/null
+++ b/bash/vars
@@ -0,0 +1,2 @@
+export SESSION_KEY=paco
+export ANSIBLE_VAULT_PASSWORD_FILE=~/.vault_pass.txt
diff --git a/bash_profile b/bash_profile
index bdd1cb49cb..c2c3aa3ec3 100644
--- a/bash_profile
+++ b/bash_profile
@@ -2,6 +2,7 @@ source ~/.bash/aliases
 source ~/.bash/completions
 source ~/.bash/paths
 source ~/.bash/config
+source ~/.bash/vars
 
 if [ -f ~/.bashrc ]; then
   . ~/.bashrc
@@ -12,3 +13,4 @@ eval "$(rbenv init -)"
 
 ### Added by the Heroku Toolbelt
 export PATH="/usr/local/heroku/bin:$PATH"
+ssh-add 2> /dev/null
diff --git a/gitconfig b/gitconfig
index 8fc202c90b..cb2b2b11d8 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,3 +17,9 @@
 	default = tracking
 [github]
   user = jrom
+[diff]
+	tool = vimdiff
+[merge]
+	tool = vimdiff
+[difftool]
+	prompt = false
diff --git a/gitignore b/gitignore
index 32d87768aa..d9ce4743d7 100644
--- a/gitignore
+++ b/gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 .svn
 *~
+.ackrc