diff --git a/bashrc b/bashrc
index 4384b9d6..ff940319 100644
--- a/bashrc
+++ b/bashrc
@@ -8,7 +8,7 @@
 export TERMINAL=/usr/bin/konsole
 export TERM=xterm-256color
 export PATH=~/.bin:/opt/lampp/bin:$PATH:.
-export EDITOR=vim
+export EDITOR='vim --servername jab2870'
 export CDPATH=.:~:~/Sites
 
 #Ruby things
@@ -185,6 +185,9 @@ alias .v='cd ~/.vim/'
 	alias df='cd ~/.dotfiles'
 #fi
 
+#Make vim start in server mode
+alias vim='vim --servername jab2870'
+
 # moon phase
 alias moonphase='weather moon'
 
diff --git a/config/vim b/config/vim
index b1a4a848..5388c0d8 160000
--- a/config/vim
+++ b/config/vim
@@ -1 +1 @@
-Subproject commit b1a4a848c3ccbefd65ab159200e5c327316d484f
+Subproject commit 5388c0d897a81205fc94bebf65a0b77209770039