Update git submodules

.gitmodules

@@ -1,123 +1,125 @@
 [submodule "vim/bundle/ctrlp.vim"]
-        path = vim/bundle/ctrlp.vim
-        url = https://github.com/kien/ctrlp.vim.git
-        ignore = dirty
+	path = vim/bundle/ctrlp.vim
+	url = https://github.com/kien/ctrlp.vim.git
+	ignore = dirty
 [submodule "vim/bundle/delimitMate"]
-        path = vim/bundle/delimitMate
-        url = https://github.com/Raimondi/delimitMate.git
-        ignore = dirty
+	path = vim/bundle/delimitMate
+	url = https://github.com/Raimondi/delimitMate.git
+	ignore = dirty
 [submodule "vim/bundle/LaTeX-Box"]
-        path = vim/bundle/LaTeX-Box
-        url = https://github.com/vim-scripts/LaTeX-Box.git
-        ignore = dirty
+	path = vim/bundle/LaTeX-Box
+	url = https://github.com/vim-scripts/LaTeX-Box.git
+	ignore = dirty
 [submodule "vim/bundle/nerdcommenter"]
-        path = vim/bundle/nerdcommenter
-        url = https://github.com/scrooloose/nerdcommenter.git
-        ignore = dirty
+	path = vim/bundle/nerdcommenter
+	url = https://github.com/scrooloose/nerdcommenter.git
+	ignore = dirty
 [submodule "vim/bundle/nerdtree"]
-        path = vim/bundle/nerdtree
-        url = https://github.com/scrooloose/nerdtree.git
-        ignore = dirty
+	path = vim/bundle/nerdtree
+	url = https://github.com/scrooloose/nerdtree.git
+	ignore = dirty
 [submodule "vim/bundle/restore_view.vim"]
-        path = vim/bundle/restore_view.vim
-        url = https://github.com/vim-scripts/restore_view.vim.git
-        ignore = dirty
+	path = vim/bundle/restore_view.vim
+	url = https://github.com/vim-scripts/restore_view.vim.git
+	ignore = dirty
 [submodule "vim/bundle/syntastic"]
-        path = vim/bundle/syntastic
-        url = https://github.com/scrooloose/syntastic.git
-        ignore = dirty
+	path = vim/bundle/syntastic
+	url = https://github.com/scrooloose/syntastic.git
+	ignore = dirty
 [submodule "vim/bundle/vim-easytags"]
-        path = vim/bundle/vim-easytags
-        url = https://github.com/xolox/vim-easytags.git
-        ignore = dirty
+	path = vim/bundle/vim-easytags
+	url = https://github.com/xolox/vim-easytags.git
+	ignore = dirty
 [submodule "vim/bundle/vim-fanfingtastic"]
-        path = vim/bundle/vim-fanfingtastic
-        url = https://github.com/dahu/vim-fanfingtastic.git
-        ignore = dirty
+	path = vim/bundle/vim-fanfingtastic
+	url = https://github.com/dahu/vim-fanfingtastic.git
+	ignore = dirty
 [submodule "vim/bundle/vim-monokai"]
-        path = vim/bundle/vim-monokai
-        url = https://github.com/bsofdth/vim-monokai.git
-        ignore = dirty
+	path = vim/bundle/vim-monokai
+	url = https://github.com/bsofdth/vim-monokai.git
+	ignore = dirty
 [submodule "vim/bundle/vim-sensible"]
-        path = vim/bundle/vim-sensible
-        url = https://github.com/tpope/vim-sensible.git
-        ignore = dirty
+	path = vim/bundle/vim-sensible
+	url = https://github.com/tpope/vim-sensible.git
+	ignore = dirty
 [submodule "vim/bundle/YouCompleteMe"]
-        path = vim/bundle/YouCompleteMe
-        url = https://github.com/Valloric/YouCompleteMe.git
-        ignore = dirty
+	path = vim/bundle/YouCompleteMe
+	url = https://github.com/Valloric/YouCompleteMe.git
+	ignore = dirty
 [submodule "vim/pathogen"]
-        path = vim/pathogen
-        url = https://github.com/tpope/vim-pathogen.git
-        ignore = dirty
+	path = vim/pathogen
+	url = https://github.com/tpope/vim-pathogen.git
+	ignore = dirty
 [submodule "vim/bundle/vim-fuhttpsive"]
-        path = vim/bundle/vim-fugitive
-        url = https://github.com/tpope/vim-fugitive.git
-        ignore = dirty
+	path = vim/bundle/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive.git
+	ignore = dirty
 [submodule "vim/bundle/vim-surround"]
-        path = vim/bundle/vim-surround
-        url = https://github.com/tpope/vim-surround.git
-        ignore = dirty
+	path = vim/bundle/vim-surround
+	url = https://github.com/tpope/vim-surround.git
+	ignore = dirty
 [submodule "vim/bundle/vim-misc"]
-        path = vim/bundle/vim-misc
-        url = https://github.com/xolox/vim-misc.git
-        ignore = dirty
+	path = vim/bundle/vim-misc
+	url = https://github.com/xolox/vim-misc.git
+	ignore = dirty
 [submodule "vim/bundle/vim-rails"]
-        path = vim/bundle/vim-rails
-        url = https://github.com/tpope/vim-rails.git
-        ignore = dirty
+	path = vim/bundle/vim-rails
+	url = https://github.com/tpope/vim-rails.git
+	ignore = dirty
 [submodule "vim/bundle/vim-endwise"]
-        path = vim/bundle/vim-endwise
-        url = https://github.com/tpope/vim-endwise.git
-        ignore = dirty
+	path = vim/bundle/vim-endwise
+	url = https://github.com/tpope/vim-endwise.git
+	ignore = dirty
 [submodule "vim/bundle/vim-airline"]
-        path = vim/bundle/vim-airline
-        url = https://github.com/vim-airline/vim-airline.git
-        ignore = dirty
+	path = vim/bundle/vim-airline
+	url = https://github.com/vim-airline/vim-airline.git
+	ignore = dirty
 [submodule "vim/bundle/vim-coffee-script"]
-        path = vim/bundle/vim-coffee-script
-        url = https://github.com/kchmck/vim-coffee-script.git
-        ignore = dirty
+	path = vim/bundle/vim-coffee-script
+	url = https://github.com/kchmck/vim-coffee-script.git
+	ignore = dirty
 [submodule "vim/bundle/ack.vim"]
-        path = vim/bundle/ack.vim
-        url = https://github.com/mileszs/ack.vim.git
-        ignore = dirty
+	path = vim/bundle/ack.vim
+	url = https://github.com/mileszs/ack.vim.git
+	ignore = dirty
 [submodule "vim/bundle/vim-bundler"]
-        path = vim/bundle/vim-bundler
-        url = https://github.com/tpope/vim-bundler.git
-        ignore = dirty
+	path = vim/bundle/vim-bundler
+	url = https://github.com/tpope/vim-bundler.git
+	ignore = dirty
 [submodule "vim/bundle/vim-cucumber"]
-        path = vim/bundle/vim-cucumber
-        url = https://github.com/tpope/vim-cucumber.git
-        ignore = dirty
+	path = vim/bundle/vim-cucumber
+	url = https://github.com/tpope/vim-cucumber.git
+	ignore = dirty
 [submodule "vim/bundle/tabular"]
-        path = vim/bundle/tabular
-        url = https://github.com/godlygeek/tabular.git
-        ignore = dirty
+	path = vim/bundle/tabular
+	url = https://github.com/godlygeek/tabular.git
+	ignore = dirty
 [submodule "vim/bundle/vim-rspec"]
-        path = vim/bundle/vim-rspec
-        url = https://github.com/tpope/vim-rspec.git
-        ignore = dirty
+	path = vim/bundle/vim-rspec
+	url = https://github.com/tpope/vim-rspec.git
+	ignore = dirty
 [submodule "vim/bundle/tabular.vim"]
-        path = vim/bundle/tabular.vim
-        url = https://github.com/godlygeek/tabular.git
-        ignore = dirty
+	path = vim/bundle/tabular.vim
+	url = https://github.com/godlygeek/tabular.git
+	ignore = dirty
 [submodule "vim/bundle/vim-airline-themes"]
-        path = vim/bundle/vim-airline-themes
-        url = https://github.com/vim-airline/vim-airline-themes.git
+	path = vim/bundle/vim-airline-themes
+	url = https://github.com/vim-airline/vim-airline-themes.git
 [submodule "vim/bundle/vim-go"]
-        path = vim/bundle/vim-go
-        url = https://github.com/fatih/vim-go
-        ignore = dirty
+	path = vim/bundle/vim-go
+	url = https://github.com/fatih/vim-go
 [submodule "vim/bundle/mustache"]
-        path = vim/bundle/mustache
-        url = https://github.com/mustache/vim-mustache-handlebars.git
+	path = vim/bundle/mustache
+	url = https://github.com/mustache/vim-mustache-handlebars.git
 [submodule "vim/bundle/vim-polyglot"]
-        path = vim/bundle/vim-polyglot
-        url = https://github.com/sheerun/vim-polyglot.git
+	path = vim/bundle/vim-polyglot
+	url = https://github.com/sheerun/vim-polyglot.git
 [submodule "vim/bundle/gotests-vim"]
-        path = vim/bundle/gotests-vim
-        url = https://github.com/buoto/gotests-vim
+	path = vim/bundle/gotests-vim
+	url = https://github.com/buoto/gotests-vim
 [submodule "vim/bundle/vim-json"]
-        path = vim/bundle/vim-json
-        url = https://github.com/elzr/vim-json
+	path = vim/bundle/vim-json
+	url = https://github.com/elzr/vim-json
+[submodule "vim/bundle/vim-operator-highlight"]
+	path = vim/bundle/vim-operator-highlight
+	url = https://github.com/ajswis/vim-operator-highlight

vim/bundle/nerdtree

@@ -1 +1 @@
-Subproject commit 54b423e0f8d6cff09b8fdd202baee596d3341dc9
+Subproject commit 626e80f6e47b0a74d86ccbc14c4247b1dbd60a7a

vim/bundle/vim-airline

@@ -1 +1 @@
-Subproject commit 7d082c03b2f4f16b31b9b54cb26bcfc40a0c0017
+Subproject commit fde2511201399048e34f8e9460d8c6cb5cb066d8

vim/bundle/vim-operator-highlight

@@ -0,0 +1 @@
+Subproject commit 522552f0dbb275146e2b62ec1b2f00d04912cab4

vim/bundle/vim-rails

@@ -1 +1 @@
-Subproject commit d0b6a3d06a5d00ec72385bbf202f9d533e87f7c3
+Subproject commit 7206033fc2d7d53a531502ecd5a044ecdacc0354

vimrc

@@ -293,6 +293,12 @@ let g:rails_gem_projections = {
 let g:rails_projections = {
       \   "app/services/*.rb": {"command": "service"}
       \ }
+""""""""""""""""""""""""""""
+" delimitMate
+""""""""""""""""""""""""""""
+
+let g:delimitMate_expand_space = 1
+let g:delimitMate_expand_cr = 1
 
 """"""""""""""""""""""""""""
 " YCM Settings
@@ -386,10 +392,11 @@ let g:go_highlight_operators = 1
 let g:go_highlight_extra_types = 1
 let g:go_highlight_format_strings = 1
 let g:go_highlight_generate_tags = 1
-
 let g:syntastic_go_checkers = ['golint', 'govet', 'errcheck']
 let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
 set rtp+=$GOPATH/src/github.com/golang/lint/misc/vim
 
 let g:vim_json_syntax_conceal = 1
 com! FormatJSON %!python -m json.tool
+
+let g:ophigh_highlight_link_group = "Operator"