Merge branch 'master' into preconfig

Conflicts:
	.gitignore
	README.md

Author: Edgecase Pairing

.gitignore

@@ -1,2 +1,3 @@
 .vim/custom_config
 .vim/custom_preconfig
+.vim/.netrwhist

.gvimrc

@@ -8,9 +8,6 @@
   set guioptions-=r
   set guioptions-=L
 
-" transparency
-  set transparency=5
-
 " go full screen like you mean it
   if has('win32')
     au GUIEnter * simalt ~x

.vim/common_config/01_plugin_config.vim

@@ -1,24 +1,28 @@
-" Plugins are managed by Vundle. Once VIM is open run :BundleInstall to
+" Plugins are managed by NeoBundle. Once VIM is open run :NeoBundleInstall to
 " install plugins.
+ call neobundle#begin(expand('~/.vim/bundle/'))
+
+ " Let NeoBundle manage NeoBundle
+ NeoBundleFetch 'Shougo/neobundle.vim'
 
 " Plugins requiring no additional configuration or keymaps
-  Bundle "git://github.com/michaeljsmith/vim-indent-object.git"
-  Bundle "git://github.com/oscarh/vimerl.git"
-  Bundle "git://github.com/pangloss/vim-javascript.git"
-  Bundle "git://github.com/tomtom/tcomment_vim.git"
-  Bundle "git://github.com/tpope/vim-endwise.git"
-  Bundle "git://github.com/tpope/vim-fugitive.git"
-  Bundle "git://github.com/tpope/vim-haml.git"
-  Bundle "git://github.com/tpope/vim-rake.git"
-  Bundle "git://github.com/tpope/vim-repeat.git"
-  Bundle "git://github.com/vim-ruby/vim-ruby.git"
-  Bundle "git://github.com/vim-scripts/L9.git"
-  Bundle "git://github.com/vim-scripts/matchit.zip"
-  Bundle "git://github.com/vim-scripts/ruby-matchit.git"
-  Bundle "git://github.com/tpope/vim-abolish.git"
-
- " Vim airline configs 
-  Plugin 'bling/vim-airline'
+  NeoBundle "git://github.com/michaeljsmith/vim-indent-object.git"
+  NeoBundle "git://github.com/oscarh/vimerl.git"
+  NeoBundle "git://github.com/pangloss/vim-javascript.git"
+  NeoBundle "git://github.com/tomtom/tcomment_vim.git"
+  NeoBundle "git://github.com/tpope/vim-endwise.git"
+  NeoBundle "git://github.com/tpope/vim-fugitive.git"
+  NeoBundle "git://github.com/tpope/vim-haml.git"
+  NeoBundle "git://github.com/tpope/vim-rake.git"
+  NeoBundle "git://github.com/tpope/vim-repeat.git"
+  NeoBundle "git://github.com/vim-ruby/vim-ruby.git"
+  NeoBundle "git://github.com/vim-scripts/L9.git"
+  NeoBundle "git://github.com/vim-scripts/matchit.zip"
+  NeoBundle "git://github.com/vim-scripts/ruby-matchit.git"
+  NeoBundle "git://github.com/tpope/vim-abolish.git"
+
+ " Vim airline configs
+  NeoBundle 'git://github.com/bling/vim-airline.git'
   let g:airline_powerline_fonts = 1
   let g:airline_mode_map = {
       \ '__' : '-',
@@ -35,22 +39,22 @@
       \ }
 
 " Easy motion config
-  Bundle "git://github.com/Lokaltog/vim-easymotion.git"
+  NeoBundle "git://github.com/Lokaltog/vim-easymotion.git"
 
 "Supertab code completion"
-  Bundle "git://github.com/ervandew/supertab.git"
+  NeoBundle "git://github.com/ervandew/supertab.git"
   let g:SuperTabContextDefaultCompletionType = "<c-n>"
 
 
 " Dash Searching"
-  Bundle "git://github.com/rizzatti/funcoo.vim.git"
-  Bundle "git://github.com/rizzatti/dash.vim.git"
+  NeoBundle "git://github.com/rizzatti/funcoo.vim.git"
+  NeoBundle "git://github.com/rizzatti/dash.vim.git"
     nmap <Leader>qs <Plug>DashSearch
     nmap <Leader>qa <Plug>DashGlobalSearch
 
 
 " CtrlP
-  Bundle "git://github.com/kien/ctrlp.vim.git"
+  NeoBundle "git://github.com/kien/ctrlp.vim.git"
     nnoremap <Leader>b :<C-U>CtrlPBuffer<CR>
     nnoremap <Leader>t :<C-U>CtrlP<CR>
     nnoremap <Leader>T :<C-U>CtrlPTag<CR>
@@ -59,31 +63,31 @@
     let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . --cached --exclude-standard --others']
 
 " Go
-  Bundle "git://github.com/jnwhiteh/vim-golang.git"
+  NeoBundle "git://github.com/jnwhiteh/vim-golang.git"
     au BufNewFile,BufRead *.go set filetype=go
 
 " Slim
-  Bundle "git://github.com/slim-template/vim-slim.git"
+  NeoBundle "git://github.com/slim-template/vim-slim.git"
     au BufNewFile,BufRead *.slim set filetype=slim
 
 " Less
-  Bundle "git://github.com/groenewege/vim-less.git"
+  NeoBundle "git://github.com/groenewege/vim-less.git"
     au BufNewFile,BufRead *.less set filetype=less
 
 " Handlebars, Mustache, and Friends
-  Bundle "git://github.com/mustache/vim-mustache-handlebars.git"
+  NeoBundle "git://github.com/mustache/vim-mustache-handlebars.git"
   au  BufNewFile,BufRead *.mustache,*.handlebars,*.hbs,*.hogan,*.hulk,*.hjs set filetype=html syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim
 
 " Stylus
-  Bundle "git://github.com/wavded/vim-stylus.git"
+  NeoBundle "git://github.com/wavded/vim-stylus.git"
     au BufNewFile,BufRead *.styl set filetype=stylus
 
 " Coffee script
-  Bundle "git://github.com/kchmck/vim-coffee-script.git"
+  NeoBundle "git://github.com/kchmck/vim-coffee-script.git"
     au BufNewFile,BufRead *.coffee set filetype=coffee
 
 " AG aka The Silver Searcher
-  Bundle 'git://github.com/rking/ag.vim.git'
+  NeoBundle 'git://github.com/rking/ag.vim.git'
     nmap g/ :Ag!<space>
     nmap g* :Ag! -w <C-R><C-W><space>
     nmap ga :AgAdd!<space>
@@ -94,28 +98,28 @@
 
 
 " Tagbar for navigation by tags using CTags
-  Bundle "git://github.com/majutsushi/tagbar.git"
+  NeoBundle "git://github.com/majutsushi/tagbar.git"
     let g:tagbar_autofocus = 1
     map <Leader>rt :!ctags --extra=+f -R *<CR><CR>
     map <Leader>. :TagbarToggle<CR>
 
 " Markdown syntax highlighting
-  Bundle "git://github.com/tpope/vim-markdown.git"
+  NeoBundle "git://github.com/tpope/vim-markdown.git"
     augroup mkd
       autocmd BufNewFile,BufRead *.mkd      set ai formatoptions=tcroqn2 comments=n:> filetype=markdown
       autocmd BufNewFile,BufRead *.md       set ai formatoptions=tcroqn2 comments=n:> filetype=markdown
       autocmd BufNewFile,BufRead *.markdown set ai formatoptions=tcroqn2 comments=n:> filetype=markdown
     augroup END
 
 " NERDTree for project drawer
-  Bundle "git://github.com/scrooloose/nerdtree.git"
+  NeoBundle "git://github.com/scrooloose/nerdtree.git"
     let NERDTreeHijackNetrw = 0
     nmap <leader>g :NERDTreeToggle<CR>
     nmap <leader>G :NERDTreeFind<CR>
 
 
 " Tabular for aligning text
-  Bundle "git://github.com/godlygeek/tabular.git"
+  NeoBundle "git://github.com/godlygeek/tabular.git"
     function! CustomTabularPatterns()
       if exists('g:tabular_loaded')
         AddTabularPattern! symbols         / :/l0
@@ -134,12 +138,12 @@
     map <Leader>a :Tabularize<space>
 
 " ZoomWin to fullscreen a particular buffer without losing others
-  Bundle "git://github.com/vim-scripts/ZoomWin.git"
+  NeoBundle "git://github.com/vim-scripts/ZoomWin.git"
     map <Leader>z :ZoomWin<CR>
 
 
 " Unimpaired for keymaps for quicky manipulating lines and files
-  Bundle "git://github.com/tpope/vim-unimpaired.git"
+  NeoBundle "git://github.com/tpope/vim-unimpaired.git"
     " Bubble single lines
     nmap <C-Up> [e
     nmap <C-Down> ]e
@@ -150,7 +154,7 @@
 
 
 " Syntastic for catching syntax errors on save
-  Bundle "git://github.com/scrooloose/syntastic.git"
+  NeoBundle "git://github.com/scrooloose/syntastic.git"
     let g:syntastic_enable_signs=1
     let g:syntastic_quiet_messages = {'level': 'warning'}
     " syntastic is too slow for haml and sass
@@ -160,12 +164,12 @@
 
 
 " gundo for awesome undo tree visualization
-  Bundle "git://github.com/sjl/gundo.vim.git"
+  NeoBundle "git://github.com/sjl/gundo.vim.git"
     map <Leader>h :GundoToggle<CR>
 
 
 " rails.vim, nuff' said
-  Bundle "git://github.com/tpope/vim-rails.git"
+  NeoBundle "git://github.com/tpope/vim-rails.git"
     map <Leader>oc :Rcontroller<Space>
     map <Leader>ov :Rview<Space>
     map <Leader>om :Rmodel<Space>
@@ -176,7 +180,7 @@
 
 
 " surround for adding surround 'physics'
-  Bundle "git://github.com/tpope/vim-surround.git"
+  NeoBundle "git://github.com/tpope/vim-surround.git"
     " # to surround with ruby string interpolation
     let g:surround_35 = "#{\r}"
     " - to surround with no-output erb tag
@@ -186,11 +190,11 @@
 
 
 " Clojure Highlighting"
-  Bundle "git://github.com/tpope/vim-fireplace.git"
-  Bundle "git://github.com/tpope/vim-classpath.git"
-  Bundle "git://github.com/guns/vim-clojure-static.git"
-  Bundle "git://github.com/vim-scripts/paredit.vim"
-  Bundle "git://github.com/amdt/vim-niji.git"
+  NeoBundle "git://github.com/tpope/vim-fireplace.git"
+  NeoBundle "git://github.com/tpope/vim-classpath.git"
+  NeoBundle "git://github.com/guns/vim-clojure-static.git"
+  NeoBundle "git://github.com/vim-scripts/paredit.vim"
+  NeoBundle "git://github.com/amdt/vim-niji.git"
   autocmd BufNewFile,BufRead *.clj set filetype=clojure
   autocmd BufNewFile,BufRead *.edn set filetype=clojure
   autocmd BufNewFile,BufRead *.cljs set filetype=clojure
@@ -200,18 +204,28 @@
   let vimclojure#ParenRainbow  = 1
 
 " Jade Highlighting"
-  Bundle "git://github.com/digitaltoad/vim-jade.git"
+  NeoBundle "git://github.com/digitaltoad/vim-jade.git"
   autocmd BufNewFile,BufRead *.jade set filetype=jade
 
 " Scala Highlighting"
-  Bundle "git://github.com/derekwyatt/vim-scala.git"
+  NeoBundle "git://github.com/derekwyatt/vim-scala.git"
   autocmd BufNewFile,BufRead *.scala set filetype=scala
 
 " Elixir plugin
-  Bundle "git://github.com/elixir-lang/vim-elixir.git"
+  NeoBundle "git://github.com/elixir-lang/vim-elixir.git"
     au BufNewFile,BufRead *.ex set filetype=elixir
     au BufNewFile,BufRead *.exs set filetype=elixir
 
 " Rust!
-  Plugin 'wting/rust.vim'
-
+  NeoBundle 'git://github.com/bling/vim-airline.git'
+
+ call neobundle#end()
+
+" Easy async RSpec running
+  Bundle 'thoughtbot/vim-rspec'
+  Bundle "git://github.com/tpope/vim-dispatch.git"
+  let g:rspec_command = "Dispatch rspec --format=progress --no-profile {spec}"
+  nmap <Leader>rc :wa<CR> :call RunCurrentSpecFile()<CR>
+  nmap <Leader>rn :wa<CR> :call RunNearestSpec()<CR>
+  nmap <Leader>rl :wa<CR> :call RunLastSpec()<CR>
+  nmap <Leader>ra :wa<CR> :call RunAllSpecs()<CR>

.vimrc

@@ -1,5 +1,4 @@
-set rtp+=~/.vim/vundle.git/
-call vundle#rc()
+set rtp+=~/.vim/bundle/neobundle.vim/
 
 runtime! custom_preconfig/*.vim
 runtime! common_config/*.vim

README.md

@@ -26,8 +26,8 @@ Windows users: be sure to use **RailsInstaller** > **Command Prompt with Ruby an
 2. `cd vim-config`
 3. `rake` (This will symlink the necessary files to your home directory, asking for permission before clobbering anything.)
 4. `vim` (or in Windows: `gvim`)
-5. `:BundleClean` (if you have previously used this Neo Vim config)
-6. `:BundleInstall` (This will clone and install all of the plugins from github.)
+5. `:NeoBundleClean` (if you have previously used this Neo Vim config)
+6. `:NeoBundleInstall` (This will clone and install all of the plugins from github.)
 
 ## Customizing
 
@@ -38,7 +38,7 @@ Customizations can be added to the folder `.vim/custom_preconfig/` or `.vim/cust
 
 The custom_preconfig settings are loaded prior to the common config. A common usecase for this is to reset mapleader.  Most of the rest of the customizations are placed in custom_config.
 
-You can add custom plugins by registering them in a `.vim` file in the custom_config folder with the same `Bundle "plugin-repo-url"`
+You can add custom plugins by registering them in a `.vim` file in the custom_config folder with the same `NeoBundle "plugin-repo-url"`
 syntax used in the `.vim/common_config/plugin_config.vim`, and then performing steps 3 & 4 from the install steps above.
 
 Common practice is to symlink a folder containing your custom configuration files as the `.vim/custom_config` folder.
@@ -226,7 +226,7 @@ functionality to your vim projects.  You can learn more about it with
 `:help NERDTree`.
 
 **Customizations**:
-Use `gt` to toggle NERDTree
+Use `<leader>g` to toggle NERDTree
 
 ## Tabular
 

Rakefile

@@ -27,12 +27,12 @@ task :default do
   Rake::Task['vundle'].execute
 end
 
-desc "Install vundle for vim plugins"
+desc "Install neobundle for vim plugins"
 task :vundle do
-  target = "#{platform_files['.vim']}/vundle.git"
-  Installer.git_clone('http://github.com/gmarik/Vundle.vim.git', target)
+  target = "#{platform_files['.vim']}/bundle/neobundle.vim"
+  Installer.git_clone('https://github.com/Shougo/neobundle.vim', target)
   puts "Running BundleInstall to install plugins...this will take a couple minutes."
-  `vim +BundleInstall +qall`
+  `vim +NeoBundleInstall +qall`
   puts "vim plugins installed."
 end