From 5f920e2a81845e232ca0ccbf4d29729c9a980b4d Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 3 Feb 2016 23:48:36 -0500
Subject: [PATCH] Added scala support

---
 .gitmodules                               |  8 +++++++-
 bundle/{vim-colorschemes => colorschemes} |  0
 bundle/syntastic                          |  1 +
 bundle/vim-scala                          |  1 +
 vimrc                                     | 14 +++++++++++++-
 5 files changed, 22 insertions(+), 2 deletions(-)
 rename bundle/{vim-colorschemes => colorschemes} (100%)
 create mode 160000 bundle/syntastic
 create mode 160000 bundle/vim-scala

diff --git a/.gitmodules b/.gitmodules
index ba1d7ab..8d65e68 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,5 +8,11 @@
 	path = bundle/airline
 	url = https://github.com/vim-airline/vim-airline
 [submodule "bundle/vim-colorschemes"]
-	path = bundle/vim-colorschemes
+	path = bundle/colorschemes
 	url = https://github.com/flazz/vim-colorschemes
+[submodule "bundle/vim-scala"]
+	path = bundle/vim-scala
+	url = https://github.com/derekwyatt/vim-scala
+[submodule "bundle/syntastic"]
+	path = bundle/syntastic
+	url = https://github.com/scrooloose/syntastic
diff --git a/bundle/vim-colorschemes b/bundle/colorschemes
similarity index 100%
rename from bundle/vim-colorschemes
rename to bundle/colorschemes
diff --git a/bundle/syntastic b/bundle/syntastic
new file mode 160000
index 0000000..d8af502
--- /dev/null
+++ b/bundle/syntastic
@@ -0,0 +1 @@
+Subproject commit d8af5028ecd541f721dab769479092b643f47a76
diff --git a/bundle/vim-scala b/bundle/vim-scala
new file mode 160000
index 0000000..842baaf
--- /dev/null
+++ b/bundle/vim-scala
@@ -0,0 +1 @@
+Subproject commit 842baaff633b61fcc92e1db10042f0ed9571cf95
diff --git a/vimrc b/vimrc
index b619ebe..4ac5d3a 100644
--- a/vimrc
+++ b/vimrc
@@ -43,6 +43,18 @@ set number
 set backspace=indent,eol,start
 set hlsearch
 
+set splitright
+set splitbelow
+
+map <C-n> :NERDTreeToggle<CR>
+
+let g:airline#extensions#tabline#enabled = 1
+
+set laststatus=2
+"
 "" I think this is some command for OS X compatibility? I don't know. Leaving
 "" it here so that I can find it later if I need it.
-"set term=xterm
+"set term=xterm-color
+
+colorscheme 256-grayvim
+"colorscheme gentooish