38 files changed, 14 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules
index 63956d7..91c7730 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
-[submodule "vim/.vim/bundle/fugitive"]
-	path = vim/.vim/bundle/fugitive
+[submodule "vim/vim/bundle/fugitive"]
+	path = vim/vim/bundle/fugitive
 	url = https://github.com/tpope/vim-fugitive.git
-[submodule "vim/.vim/bundle/nerdtree"]
-	path = vim/.vim/bundle/nerdtree
+[submodule "vim/vim/bundle/nerdtree"]
+	path = vim/vim/bundle/nerdtree
 	url = https://github.com/scrooloose/nerdtree.git
-[submodule "vim/.vim/bundle/vim-scala"]
-	path = vim/.vim/bundle/vim-scala
+[submodule "vim/vim/bundle/vim-scala"]
+	path = vim/vim/bundle/vim-scala
 	url = https://github.com/derekwyatt/vim-scala.git
-[submodule "vim/.vim/bundle/syntastic"]
-	path = vim/.vim/bundle/syntastic
+[submodule "vim/vim/bundle/syntastic"]
+	path = vim/vim/bundle/syntastic
 	url = https://github.com/scrooloose/syntastic/
-[submodule "vim/.vim/bundle/sbt"]
-	path = vim/.vim/bundle/sbt
+[submodule "vim/vim/bundle/sbt"]
+	path = vim/vim/bundle/sbt
 	url = https://github.com/ktvoelker/sbt-vim
diff --git a/bash/.bash_aliases b/bash/bash_aliases
index 607f80a..607f80a 100644
--- a/bash/.bash_aliases
+++ b/bash/bash_aliases
diff --git a/bash/.bashrc b/bash/bashrc
index 40e0b45..40e0b45 100644
--- a/bash/.bashrc
+++ b/bash/bashrc
diff --git a/install.sh b/install.sh
index f0083c1..320cb20 100644..100755
--- a/install.sh
+++ b/install.sh
@@ -6,10 +6,10 @@ cd `dirname $0`
 
 CURRENT_PATH=`pwd`
 
-ln -s $CURRENT_PATH/bash/.bashrc ~/.bashrc
-ln -s $CURRENT_PATH/bash/.bash_aliases ~/.bash_aliases
+ln -s $CURRENT_PATH/bash/bashrc ~/.bashrc
+ln -s $CURRENT_PATH/bash/bash_aliases ~/.bash_aliases
 
-ln -s $CURRENT_PATH/vim/.vimrc ~/.vimrc
-ln -s $CURRENT_PATH/vim/.vim ~/.vim
+ln -s $CURRENT_PATH/vim/vimrc ~/.vimrc
+ln -s $CURRENT_PATH/vim/vim ~/.vim
 
 ln -s $CURRENT_PATH/Xdefaults ~/.Xdefaults
diff --git a/vim/.vim/bundle/fugitive b/vim/.vim/bundle/fugitive
deleted file mode 160000
-Subproject f64ba46509119810959bd03e8e47348cabf804b
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
deleted file mode 160000
-Subproject 1dc3891f960c25aa3f23aa46f5afc8d41db3823
diff --git a/vim/.vim/bundle/sbt b/vim/.vim/bundle/sbt
deleted file mode 160000
-Subproject ac2609cdb44a0a7504b74a5f6fa7c6fd3d62d5f
diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic
deleted file mode 160000
-Subproject ccecbcb4606ad6a7cfecae5eacb15022ce521b4
diff --git a/vim/.vim/bundle/vim-scala b/vim/.vim/bundle/vim-scala
deleted file mode 160000
-Subproject e78d6ebbedd89280d1e8696dfb34c6381ecfc7c
diff --git a/vim/.vim/autoload/pathogen.vim b/vim/vim/autoload/pathogen.vim
index be68389..be68389 100644
--- a/vim/.vim/autoload/pathogen.vim
+++ b/vim/vim/autoload/pathogen.vim
diff --git a/vim/.vim/bundle/after/plugin b/vim/vim/bundle/after/plugin
index 075578a..075578a 100644
--- a/vim/.vim/bundle/after/plugin
+++ b/vim/vim/bundle/after/plugin
diff --git a/vim/vim/bundle/fugitive b/vim/vim/bundle/fugitive
new file mode 160000
+Subproject 1601ffc1e0ac5171e32c2f33e96d3ae88ea2788
diff --git a/vim/vim/bundle/nerdtree b/vim/vim/bundle/nerdtree
new file mode 160000
+Subproject c3b63d2fd9c929359231363bcabc880ba29eb96
diff --git a/vim/vim/bundle/syntastic b/vim/vim/bundle/syntastic
new file mode 160000
+Subproject 8095909dcc954c5736a44aa15a12ded00e8a090
diff --git a/vim/vim/bundle/vim-scala b/vim/vim/bundle/vim-scala
new file mode 160000
+Subproject 51ba1f728c22140b9b6dfccf23bba23041b1598
diff --git a/vim/.vim/memory.txt b/vim/vim/memory.txt
index c6c9b48..c6c9b48 100644
--- a/vim/.vim/memory.txt
+++ b/vim/vim/memory.txt
diff --git a/vim/.vim/shortkeys.vim b/vim/vim/shortkeys.vim
index f693e2a..f693e2a 100644
--- a/vim/.vim/shortkeys.vim
+++ b/vim/vim/shortkeys.vim
diff --git a/vim/.vim/specific/cpp.vim b/vim/vim/specific/cpp.vim
index 4dfe592..4dfe592 100644
--- a/vim/.vim/specific/cpp.vim
+++ b/vim/vim/specific/cpp.vim
diff --git a/vim/.vim/specific/cxx.vim b/vim/vim/specific/cxx.vim
index 6aada59..6aada59 100644
--- a/vim/.vim/specific/cxx.vim
+++ b/vim/vim/specific/cxx.vim
diff --git a/vim/.vim/specific/ddl.vim b/vim/vim/specific/ddl.vim
index 31b9c56..31b9c56 100644
--- a/vim/.vim/specific/ddl.vim
+++ b/vim/vim/specific/ddl.vim
diff --git a/vim/.vim/specific/egg.vim b/vim/vim/specific/egg.vim
index 137b3bd..137b3bd 100644
--- a/vim/.vim/specific/egg.vim
+++ b/vim/vim/specific/egg.vim
diff --git a/vim/.vim/specific/html.vim b/vim/vim/specific/html.vim
index 6c65216..6c65216 100644
--- a/vim/.vim/specific/html.vim
+++ b/vim/vim/specific/html.vim
diff --git a/vim/.vim/specific/java.vim b/vim/vim/specific/java.vim
index 8e94e99..8e94e99 100644
--- a/vim/.vim/specific/java.vim
+++ b/vim/vim/specific/java.vim
diff --git a/vim/.vim/specific/js.vim b/vim/vim/specific/js.vim
index 3829e28..3829e28 100644
--- a/vim/.vim/specific/js.vim
+++ b/vim/vim/specific/js.vim
diff --git a/vim/.vim/specific/mp.vim b/vim/vim/specific/mp.vim
index 3202f68..3202f68 100644
--- a/vim/.vim/specific/mp.vim
+++ b/vim/vim/specific/mp.vim
diff --git a/vim/.vim/specific/pro.vim b/vim/vim/specific/pro.vim
index 202f824..202f824 100644
--- a/vim/.vim/specific/pro.vim
+++ b/vim/vim/specific/pro.vim
diff --git a/vim/.vim/specific/py.vim b/vim/vim/specific/py.vim
index dcd9ced..dcd9ced 100644
--- a/vim/.vim/specific/py.vim
+++ b/vim/vim/specific/py.vim
diff --git a/vim/.vim/specific/tex.vim b/vim/vim/specific/tex.vim
index 204235a..204235a 100644
--- a/vim/.vim/specific/tex.vim
+++ b/vim/vim/specific/tex.vim
diff --git a/vim/.vim/specific/tla.vim b/vim/vim/specific/tla.vim
index 9629698..9629698 100644
--- a/vim/.vim/specific/tla.vim
+++ b/vim/vim/specific/tla.vim
diff --git a/vim/.vim/specific/xml.vim b/vim/vim/specific/xml.vim
index 3202f68..3202f68 100644
--- a/vim/.vim/specific/xml.vim
+++ b/vim/vim/specific/xml.vim
diff --git a/vim/.vim/templates/autocompletion.vim b/vim/vim/templates/autocompletion.vim
index a4dca09..a4dca09 100644
--- a/vim/.vim/templates/autocompletion.vim
+++ b/vim/vim/templates/autocompletion.vim
diff --git a/vim/.vim/templates/c.tpl b/vim/vim/templates/c.tpl
index 0e86285..0e86285 100644
--- a/vim/.vim/templates/c.tpl
+++ b/vim/vim/templates/c.tpl
diff --git a/vim/.vim/templates/cpp.tpl b/vim/vim/templates/cpp.tpl
index 0e86285..0e86285 100644
--- a/vim/.vim/templates/cpp.tpl
+++ b/vim/vim/templates/cpp.tpl
diff --git a/vim/.vim/templates/h.tpl b/vim/vim/templates/h.tpl
index 53a7226..53a7226 100644
--- a/vim/.vim/templates/h.tpl
+++ b/vim/vim/templates/h.tpl
diff --git a/vim/.vim/templates/html.tpl b/vim/vim/templates/html.tpl
index 1b18da7..1b18da7 100644
--- a/vim/.vim/templates/html.tpl
+++ b/vim/vim/templates/html.tpl
diff --git a/vim/.vim/templates/java.tpl b/vim/vim/templates/java.tpl
index 7b4f715..7b4f715 100644
--- a/vim/.vim/templates/java.tpl
+++ b/vim/vim/templates/java.tpl
diff --git a/vim/.vim/templates/py.tpl b/vim/vim/templates/py.tpl
index 606c45a..606c45a 100644
--- a/vim/.vim/templates/py.tpl
+++ b/vim/vim/templates/py.tpl
diff --git a/vim/.vimrc b/vim/vimrc
index 36f9b6b..36f9b6b 100644
--- a/vim/.vimrc
+++ b/vim/vimrc