diff --git a/.gitmodules b/.gitmodules
index 1efcfd6..ba40896 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,3 +100,9 @@
 [submodule "vim/bundle/rson-vim-conque"]
 	path = vim/bundle/rson-vim-conque
 	url = https://github.com/rson/vim-conque.git
+[submodule "vim/bundle/tpope-vim-pathogen"]
+	path = vim/bundle/tpope-vim-pathogen
+	url = https://github.com/tpope/vim-pathogen
+[submodule "vim/bundle/drewolson-ruby_focused_unit_test_vim"]
+	path = vim/bundle/drewolson-ruby_focused_unit_test_vim
+	url = https://github.com/drewolson/ruby_focused_unit_test_vim
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
deleted file mode 100644
index be68389..0000000
--- a/vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,230 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.0
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
-" prior to `fileype plugin indent on` is the only other setup necessary.
-"
-" The API is documented inline below.  For maximum ease of reading,
-" :set foldmethod=marker
-
-if exists("g:loaded_pathogen") || &cp
-  finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage.  Give a directory name to invoke
-" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
-" to invoke pathogen#runtime_prepend_subdirectories().  Afterwards,
-" pathogen#cycle_filetype() is invoked.
-function! pathogen#infect(...) abort " {{{1
-  let source_path = a:0 ? a:1 : 'bundle'
-  if source_path =~# '[\\/]'
-    call pathogen#runtime_prepend_subdirectories(source_path)
-  else
-    call pathogen#runtime_append_all_bundles(source_path)
-  endif
-  call pathogen#cycle_filetype()
-endfunction " }}}1
-
-" Split a path into a list.
-function! pathogen#split(path) abort " {{{1
-  if type(a:path) == type([]) | return a:path | endif
-  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
-  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction " }}}1
-
-" Convert a list to a path.
-function! pathogen#join(...) abort " {{{1
-  if type(a:1) == type(1) && a:1
-    let i = 1
-    let space = ' '
-  else
-    let i = 0
-    let space = ''
-  endif
-  let path = ""
-  while i < a:0
-    if type(a:000[i]) == type([])
-      let list = a:000[i]
-      let j = 0
-      while j < len(list)
-        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
-        let path .= ',' . escaped
-        let j += 1
-      endwhile
-    else
-      let path .= "," . a:000[i]
-    endif
-    let i += 1
-  endwhile
-  return substitute(path,'^,','','')
-endfunction " }}}1
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort " {{{1
-  return call('pathogen#join',[1] + a:000)
-endfunction " }}}1
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort " {{{1
-  let i = 0
-  let seen = {}
-  while i < len(a:list)
-    if has_key(seen,a:list[i])
-      call remove(a:list,i)
-    else
-      let seen[a:list[i]] = 1
-      let i += 1
-    endif
-  endwhile
-  return a:list
-endfunction " }}}1
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#separator() abort " {{{1
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction " }}}1
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort " {{{1
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
-endfunction "}}}1
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort " {{{1
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction "}}}1
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() " {{{1
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction " }}}1
-
-" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
-" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
-function! pathogen#is_disabled(path) " {{{1
-  if a:path =~# '\~$'
-    return 1
-  elseif !exists("g:pathogen_disabled")
-    return 0
-  endif
-  let sep = pathogen#separator()
-  return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
-endfunction "}}}1
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  let sep    = pathogen#separator()
-  let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
-  let after  = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
-  let rtp = pathogen#split(&rtp)
-  let path = expand(a:path)
-  call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  let &rtp = pathogen#join(pathogen#uniq(before + rtp + after))
-  return &rtp
-endfunction " }}}1
-
-" For each directory in rtp, check for a subdirectory named dir.  If it
-" exists, add all subdirectories of that subdirectory to the rtp, immediately
-" after the original directory.  If no argument is given, 'bundle' is used.
-" Repeated calls with the same arguments are ignored.
-function! pathogen#runtime_append_all_bundles(...) " {{{1
-  let sep = pathogen#separator()
-  let name = a:0 ? a:1 : 'bundle'
-  if "\n".s:done_bundles =~# "\\M\n".name."\n"
-    return ""
-  endif
-  let s:done_bundles .= name . "\n"
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
-    else
-      let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction
-
-let s:done_bundles = ''
-" }}}1
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() " {{{1
-  let sep = pathogen#separator()
-  for dir in pathogen#split(&rtp)
-    if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.'/doc') == 2 && !empty(glob(dir.'/doc/*')) && (!filereadable(dir.'/doc/tags') || filewritable(dir.'/doc/tags'))
-      helptags `=dir.'/doc'`
-    endif
-  endfor
-endfunction " }}}1
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#rtpfindfile(file,count) "{{{1
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  return fnamemodify(findfile(a:file,rtp,a:count),':p')
-endfunction " }}}1
-
-function! s:find(count,cmd,file,...) " {{{1
-  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
-  let file = pathogen#rtpfindfile(a:file,a:count)
-  if file ==# ''
-    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
-  elseif a:0
-    let path = file[0:-strlen(a:file)-2]
-    execute a:1.' `=path`'
-    return a:cmd.' '.fnameescape(a:file)
-  else
-    return a:cmd.' '.fnameescape(file)
-  endif
-endfunction " }}}1
-
-function! s:Findcomplete(A,L,P) " {{{1
-  let sep = pathogen#separator()
-  let cheats = {
-        \'a': 'autoload',
-        \'d': 'doc',
-        \'f': 'ftplugin',
-        \'i': 'indent',
-        \'p': 'plugin',
-        \'s': 'syntax'}
-  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
-    let request = cheats[a:A[0]].a:A[1:-1]
-  else
-    let request = a:A
-  endif
-  let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*'
-  let found = {}
-  for path in pathogen#split(&runtimepath)
-    let matches = split(glob(path.sep.pattern),"\n")
-    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
-    call map(matches,'v:val[strlen(path)+1:-1]')
-    for match in matches
-      let found[match] = 1
-    endfor
-  endfor
-  return sort(keys(found))
-endfunction " }}}1
-
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,'lcd')
-
-" vim:set ft=vim ts=8 sw=2 sts=2:
diff --git a/vim/autoload/ruby_focused_unit_test.vim b/vim/autoload/ruby_focused_unit_test.vim
deleted file mode 100644
index 49e881d..0000000
--- a/vim/autoload/ruby_focused_unit_test.vim
+++ /dev/null
@@ -1,174 +0,0 @@
-"if !has("ruby")
-"  finish
-"end
-
-command RunRubyFocusedUnitTest :call <SID>RunRubyFocusedUnitTest()
-command RunRubyFocusedContext :call <SID>RunRubyFocusedContext()
-command RunAllRubyTests :call <SID>RunAllRubyTests()
-command RunLastRubyTest :call <SID>RunLastRubyTest()
-
-function! s:RunRubyFocusedUnitTest()
-  ruby RubyFocusedUnitTest.new.run_test
-endfunction
-
-function! s:RunRubyFocusedContext()
-  ruby RubyFocusedUnitTest.new.run_context
-endfunction
-
-function! s:RunAllRubyTests()
-  ruby RubyFocusedUnitTest.new.run_all
-endfunction
-
-function! s:RunLastRubyTest()
-  ruby RubyFocusedUnitTest.new.run_last
-endfunction
-
-ruby << EOF
-module VIM
-  class Buffer
-    class << self
-      include Enumerable
-
-      def each(&block)
-        (0...VIM::Buffer.count).each do |index|
-          yield self[index]
-        end
-      end
-
-      def create(name, opts={})
-        location = opts[:location] || :below
-        VIM.command("#{location} new #{name}")
-        buf = VIM::Buffer.current
-        if opts[:text]
-          buf.text = opts[:text]
-        end
-        buf
-      end
-    end
-
-    def text=(content)
-      content.split("\n").each_with_index do |line,index|
-        self.append index, line
-      end
-    end
-
-    def method_missing(method, *args, &block)
-      VIM.command "#{method} #{self.name}"
-    end
-  end
-end
-
-class RubyFocusedUnitTest
-  DEFAULT_OUTPUT_BUFFER = "rb_test_output"
-  SAVED_TEST_COMMAND_FILE = '/tmp/last_ruby_focused_unit_test'
-
-  def write_output_to_buffer(test_command)
-    save_test_command(test_command)
-
-    if buffer = VIM::Buffer.find { |b| b.name =~ /#{DEFAULT_OUTPUT_BUFFER}/ }
-      buffer.bdelete! 
-    end
-
-    buffer = VIM::Buffer.create DEFAULT_OUTPUT_BUFFER, :location => :below, :text => "--- Run Focused Unit Test ---\n\n"
-    VIM.command("setlocal buftype=nowrite")
-    VIM.command "redraw"
-
-    IO.popen("#{test_command} 2>&1", "r") do |io|
-      begin
-        loop do
-          input = io.readpartial(10)
-          first, *rest = input.split(/\n/, -1)
-          buffer[buffer.length] = buffer[buffer.length] + first
-          rest.each {|l| buffer.append buffer.length, l }
-          VIM.command "redraw"
-        end
-      rescue EOFError
-      end
-    end
-  end
-
-  def save_test_command(test_command)
-    File.open(SAVED_TEST_COMMAND_FILE, 'w') { |f| f.write(test_command) }
-  end
-
-  def current_file
-    VIM::Buffer.current.name
-  end
-
-  def spec_file?
-    current_file =~ /spec_|_spec/
-  end
-
-  def line_number
-    VIM::Buffer.current.line_number 
-  end
-
-  def run_spec
-    write_output_to_buffer("spec #{current_file} -l #{line_number}")
-  end
-
-  def run_unit_test
-    method_name = nil
-
-    (line_number + 1).downto(1) do |line_number|
-      if VIM::Buffer.current[line_number] =~ /def (test_\w+)/ 
-        method_name = $1
-        break
-      elsif VIM::Buffer.current[line_number] =~ /test "([^"]+)"/ ||
-            VIM::Buffer.current[line_number] =~ /test '([^']+)'/ 
-        method_name = "test_" + $1.split(" ").join("_")
-        break
-      elsif VIM::Buffer.current[line_number] =~ /should "([^"]+)"/ ||
-            VIM::Buffer.current[line_number] =~ /should '([^']+)'/ 
-        method_name = "\"/#{Regexp.escape($1)}/\""
-        break
-      end
-    end
-
-    write_output_to_buffer("ruby #{current_file} -n #{method_name}") if method_name
-  end
-
-  def run_test
-    if spec_file?
-      run_spec
-    else
-      run_unit_test
-    end
-  end
-
-  def run_context
-    method_name = nil
-    context_line_number = nil
-
-    (line_number + 1).downto(1) do |line_number|
-      if VIM::Buffer.current[line_number] =~ /(context|describe) "([^"]+)"/ ||
-         VIM::Buffer.current[line_number] =~ /(context|describe) '([^']+)'/ 
-        method_name = $2
-        context_line_number = line_number
-        break
-      end
-    end
-
-    if method_name
-      if spec_file?
-        write_output_to_buffer("spec #{current_file} -l #{context_line_number}")
-      else
-        method_name = "\"/#{Regexp.escape(method_name)}/\""
-        write_output_to_buffer("ruby #{current_file} -n #{method_name}")
-      end
-    end
-  end
-
-  def run_all
-    if spec_file?
-      write_output_to_buffer("spec #{current_file}")
-    else
-      write_output_to_buffer("ruby #{current_file}")
-    end
-  end
-
-  def run_last
-    write_output_to_buffer(File.read(SAVED_TEST_COMMAND_FILE))
-  end
-end
-EOF
diff --git a/vim/bundle/drewolson-ruby_focused_unit_test_vim b/vim/bundle/drewolson-ruby_focused_unit_test_vim
new file mode 160000
index 0000000..980b2eb
--- /dev/null
+++ b/vim/bundle/drewolson-ruby_focused_unit_test_vim
@@ -0,0 +1 @@
+Subproject commit 980b2ebad5d994ce44a7a765e734e1a3ffde3004
diff --git a/vim/bundle/tpope-vim-pathogen b/vim/bundle/tpope-vim-pathogen
new file mode 160000
index 0000000..ab64b4d
--- /dev/null
+++ b/vim/bundle/tpope-vim-pathogen
@@ -0,0 +1 @@
+Subproject commit ab64b4ddd0c184a528780b498a0b0a5b40248f7c
diff --git a/vim/plugin/ragtag.vim b/vim/plugin/ragtag.vim
deleted file mode 100644
index 3843cd9..0000000
--- a/vim/plugin/ragtag.vim
+++ /dev/null
@@ -1,486 +0,0 @@
-" ragtag.vim - Ghetto XML/HTML mappings (formerly allml.vim)
-" Author:       Tim Pope <vimNOSPAM@tpope.org>
-" Version:      2.0
-" GetLatestVimScripts: 1896 1 :AutoInstall: ragtag.vim
-
-if exists("g:loaded_ragtag") || &cp
-  finish
-endif
-let g:loaded_ragtag = 1
-
-if has("autocmd")
-  augroup ragtag
-    autocmd!
-    autocmd FileType *html*,wml,xml,xslt,xsd,jsp    call s:Init()
-    autocmd FileType php,asp*,cf,mason,eruby        call s:Init()
-    if version >= 700
-      autocmd InsertLeave * call s:Leave()
-    endif
-    autocmd CursorHold * if exists("b:loaded_ragtag") | call s:Leave() | endif
-  augroup END
-endif
-
-inoremap <silent> <Plug>ragtagHtmlComplete <C-R>=<SID>htmlEn()<CR><C-X><C-O><C-P><C-R>=<SID>htmlDis()<CR><C-N>
-
-" Public interface, for if you have your own filetypes to activate on
-function! RagtagInit()
-  call s:Init()
-endfunction
-
-function! AllmlInit()
-  call s:Init()
-endfunction
-
-function! s:Init()
-  let b:loaded_ragtag = 1
-  inoremap <silent> <buffer> <SID>xmlversion  <?xml version="1.0" encoding="<C-R>=toupper(<SID>charset())<CR>"?>
-  inoremap      <buffer> <SID>htmltrans   <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-  inoremap      <buffer> <SID>xhtmltrans  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  if s:subtype() == "xml"
-    imap <script> <buffer> <SID>doctype <SID>xmlversion
-  elseif exists("+omnifunc")
-    inoremap <silent> <buffer> <SID>doctype  <C-R>=<SID>htmlEn()<CR><!DOCTYPE<C-X><C-O><C-P><C-R>=<SID>htmlDis()<CR><C-N><C-R>=<SID>doctypeSeek()<CR>
-  elseif s:subtype() == "xhtml"
-    imap <script> <buffer> <SID>doctype <SID>xhtmltrans
-  else
-    imap <script> <buffer> <SID>doctype <SID>htmltrans
-  endif
-  imap <script> <buffer> <C-X>! <SID>doctype
-
-  imap <silent> <buffer> <C-X># <meta http-equiv="Content-Type" content="text/html; charset=<C-R>=<SID>charset()<CR>"<C-R>=<SID>closetag()<CR>
-  inoremap <silent> <buffer> <SID>HtmlComplete <C-R>=<SID>htmlEn()<CR><C-X><C-O><C-P><C-R>=<SID>htmlDis()<CR><C-N>
-  imap     <buffer> <C-X>H <SID>HtmlComplete
-  inoremap <silent> <buffer> <C-X>$ <C-R>=<SID>javascriptIncludeTag()<CR>
-  inoremap <silent> <buffer> <C-X>@ <C-R>=<SID>stylesheetTag()<CR>
-  inoremap <silent> <buffer> <C-X><Space> <Esc>ciw<Lt><C-R>"<C-R>=<SID>tagextras()<CR>></<C-R>"><Esc>b2hi
-  inoremap <silent> <buffer> <C-X><CR> <Esc>ciw<Lt><C-R>"<C-R>=<SID>tagextras()<CR>><CR></<C-R>"><Esc>O
-  if exists("&omnifunc")
-    inoremap <silent> <buffer> <C-X>/ <Lt>/<C-R>=<SID>htmlEn()<CR><C-X><C-O><C-R>=<SID>htmlDis()<CR><C-F>
-    if exists(":XMLns")
-      XMLns xhtml10s
-    endif
-  else
-    inoremap <silent> <buffer> <C-X>/ <Lt>/><Left>
-  endif
-  let g:surround_{char2nr("p")} = "<p>\n\t\r\n</p>"
-  let g:surround_{char2nr("d")} = "<div\1div: \r^[^ ]\r &\1>\n\t\r\n</div>"
-  imap <buffer> <C-X><C-_> <C-X>/
-  imap <buffer> <SID>ragtagOopen    <C-X><Lt><Space>
-  imap <buffer> <SID>ragtagOclose   <Space><C-X>><Left><Left>
-  if &ft == "php"
-    inoremap <buffer> <C-X><Lt> <?php
-    inoremap <buffer> <C-X>>    ?>
-    inoremap <buffer> <SID>ragtagOopen    <?php<Space>print<Space>
-    let b:surround_45 = "<?php \r ?>"
-    let b:surround_61 = "<?php print \r ?>"
-  elseif &ft == "htmltt" || &ft == "tt2html"
-    inoremap <buffer> <C-X><Lt> [%
-    inoremap <buffer> <C-X>>    %]
-    let b:surround_45  = "[% \r %]"
-    let b:surround_61  = "[% \r %]"
-    if !exists("b:surround_101")
-      let b:surround_101 = "[% \r %]\n[% END %]"
-    endif
-  elseif &ft =~ "django"
-    inoremap <buffer> <C-X><Lt> {{
-    inoremap <buffer> <C-X>>    }}
-    let b:surround_45 = "{% \r %}"
-    let b:surround_61 = "{{ \r }}"
-  elseif &ft == "mason"
-    inoremap <buffer> <SID>ragtagOopen    <&<Space>
-    inoremap <buffer> <SID>ragtagOclose   <Space>&><Left><Left>
-    inoremap <buffer> <C-X><Lt> <%
-    inoremap <buffer> <C-X>>    %>
-    let b:surround_45 = "<% \r %>"
-    let b:surround_61 = "<& \r &>"
-  elseif &ft == "cf"
-    inoremap <buffer> <SID>ragtagOopen    <cfoutput>
-    inoremap <buffer> <SID>ragtagOclose   </cfoutput><Left><C-Left><Left>
-    inoremap <buffer> <C-X><Lt> <cf
-    inoremap <buffer> <C-X>>    >
-    let b:surround_45 = "<cf\r>"
-    let b:surround_61 = "<cfoutput>\r</cfoutput>"
-  else
-    inoremap <buffer> <SID>ragtagOopen    <%=<Space>
-    inoremap <buffer> <C-X><Lt> <%
-    inoremap <buffer> <C-X>>    %>
-    let b:surround_45 = "<% \r %>"
-    let b:surround_61 = "<%= \r %>"
-  endif
-  imap     <buffer> <C-X>= <SID>ragtagOopen<SID>ragtagOclose<Left>
-  imap     <buffer> <C-X>+ <C-V><NL><Esc>I<SID>ragtagOopen<Space><Esc>A<Space><SID>ragtagOclose<Esc>F<NL>s
-  " <%\n\n%>
-  if &ft == "cf"
-    inoremap <buffer> <C-X>] <cfscript><CR></cfscript><Esc>O
-  elseif &ft == "mason"
-    inoremap <buffer> <C-X>] <%perl><CR></%perl><Esc>O
-  elseif &ft == "html" || &ft == "xhtml" || &ft == "xml"
-    imap     <buffer> <C-X>] <script<Space>type="text/javascript"><CR></script><Esc>O
-  else
-    imap     <buffer> <C-X>] <C-X><Lt><CR><C-X>><Esc>O
-  endif
-  " <% %>
-  if &ft == "eruby"
-    inoremap  <buffer> <C-X>- <%<Space><Space>-%><Esc>3hi
-    inoremap  <buffer> <C-X>_ <C-V><NL><Esc>I<%<Space><Esc>A<Space>-%><Esc>F<NL>s
-  elseif &ft == "cf"
-    inoremap  <buffer> <C-X>- <cf><Left>
-    inoremap  <buffer> <C-X>_ <cfset ><Left>
-  else
-    imap      <buffer> <C-X>- <C-X><Lt><Space><Space><C-X>><Esc>2hi
-    imap      <buffer> <C-X>_ <C-V><NL><Esc>I<C-X><Lt><Space><Esc>A<Space><C-X>><Esc>F<NL>s
-  endif
-  " Comments
-  if &ft =~ '^asp'
-    imap     <buffer> <C-X>'     <C-X><Lt>'<Space><Space><C-X>><Esc>2hi
-    imap     <buffer> <C-X>"     <C-V><NL><Esc>I<C-X><Lt>'<Space><Esc>A<Space><C-X>><Esc>F<NL>s
-    let b:surround_35 = maparg("<C-X><Lt>","i")."' \r ".maparg("<C-X>>","i")
-  elseif &ft == "jsp"
-    inoremap <buffer> <C-X>'     <Lt>%--<Space><Space>--%><Esc>4hi
-    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<%--<Space><Esc>A<Space>--%><Esc>F<NL>s
-    let b:surround_35 = "<%-- \r --%>"
-  elseif &ft == "cf"
-    inoremap <buffer> <C-X>'     <Lt>!---<Space><Space>---><Esc>4hi
-    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<!---<Space><Esc>A<Space>---><Esc>F<NL>s
-    setlocal commentstring=<!---%s--->
-    let b:surround_35 = "<!--- \r --->"
-  elseif &ft == "html" || &ft == "xml" || &ft == "xhtml"
-    inoremap <buffer> <C-X>'     <Lt>!--<Space><Space>--><Esc>3hi
-    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<!--<Space><Esc>A<Space>--><Esc>F<NL>s
-    let b:surround_35 = "<!-- \r -->"
-  elseif &ft == "django"
-    inoremap <buffer> <C-X>'     {#<Space><Space>#}<Esc>2hi
-    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<C-X>{#<Space><Esc>A<Space>#}<Esc>F<NL>s
-    let b:surround_35 = "{# \r #}"
-  else
-    imap     <buffer> <C-X>'     <C-X><Lt>#<Space><Space><C-X>><Esc>2hi
-    imap     <buffer> <C-X>"     <C-V><NL><Esc>I<C-X><Lt>#<Space><Esc>A<Space><C-X>><Esc>F<NL>s
-    let b:surround_35 = maparg("<C-X><Lt>","i")."# \r ".maparg("<C-X>>","i")
-  endif
-  imap <buffer> <C-X>%           <Plug>ragtagUrlEncode
-  imap <buffer> <C-X>&           <Plug>ragtagXmlEncode
-  imap <buffer> <C-V>%           <Plug>ragtagUrlV
-  imap <buffer> <C-V>&           <Plug>ragtagXmlV
-  if !exists("b:did_indent")
-    if s:subtype() == "xml"
-      runtime! indent/xml.vim
-    else
-      runtime! indent/html.vim
-    endif
-  endif
-  " Pet peeve.  Do people still not close their <p> and <li> tags?
-  if exists("g:html_indent_tags") && g:html_indent_tags !~ '\\|p\>'
-    let g:html_indent_tags = g:html_indent_tags.'\|p\|li\|dt\|dd'
-  endif
-  set indentkeys+=!^F
-  let b:surround_indent = 1
-  silent doautocmd User ragtag
-  silent doautocmd User allml
-endfunction
-
-function! s:Leave()
-  call s:disableescape()
-endfunction
-
-function! s:length(str)
-  return strlen(substitute(a:str,'.','.','g'))
-endfunction
-
-function! s:repeat(str,cnt)
-  let cnt = a:cnt
-  let str = ""
-  while cnt > 0
-    let str = str . a:str
-    let cnt = cnt - 1
-  endwhile
-  return str
-endfunction
-
-function! s:doctypeSeek()
-  if !exists("b:ragtag_doctype_index")
-    if exists("b:allml_doctype_index")
-      let b:ragtag_doctype_index = b:allml_doctype_index
-    elseif &ft == 'xhtml' || &ft == 'eruby'
-      let b:ragtag_doctype_index = 10
-    elseif &ft != 'xml'
-      let b:ragtag_doctype_index = 7
-    endif
-  endif
-  let index = b:ragtag_doctype_index - 1
-  return (index < 0 ? s:repeat("\<C-P>",-index) : s:repeat("\<C-N>",index))
-endfunction
-
-function! s:stylesheetTag()
-  if !exists("b:ragtag_stylesheet_link_tag")
-    if exists("b:allml_stylesheet_link_tag")
-      let b:ragtag_stylesheet_link_tag = b:allml_stylesheet_link_tag
-    else
-      let b:ragtag_stylesheet_link_tag = "<link rel=\"stylesheet\" type=\"text/css\" href=\"/stylesheets/\r.css\" />"
-    endif
-  endif
-  return s:insertTag(b:ragtag_stylesheet_link_tag)
-endfunction
-
-function! s:javascriptIncludeTag()
-  if !exists("b:ragtag_javascript_include_tag")
-    if exists("b:allml_javascript_include_tag")
-      let b:ragtag_javascript_include_tag = b:allml_javascript_include_tag
-    else
-      let b:ragtag_javascript_include_tag = "<script type=\"text/javascript\" src=\"/javascripts/\r.js\"></script>"
-    endif
-  endif
-  return s:insertTag(b:ragtag_javascript_include_tag)
-endfunction
-
-function! s:insertTag(tag)
-  let tag = a:tag
-  if s:subtype() == "html"
-    let tag = substitute(a:tag,'\s*/>','>','g')
-  endif
-  let before = matchstr(tag,'^.\{-\}\ze\r')
-  let after  = matchstr(tag,'\r\zs\%(.*\r\)\@!.\{-\}$')
-  " middle isn't currently used
-  let middle = matchstr(tag,'\r\zs.\{-\}\ze\r')
-  return before.after.s:repeat("\<Left>",s:length(after))
-endfunction
-
-
-function! s:htmlEn()
-  let b:ragtag_omni = &l:omnifunc
-  let b:ragtag_isk = &l:isk
-  " : is for namespaced xml attributes
-  setlocal omnifunc=htmlcomplete#CompleteTags isk+=:
-  return ""
-endfunction
-
-function! s:htmlDis()
-  if exists("b:ragtag_omni")
-    let &l:omnifunc = b:ragtag_omni
-    unlet b:ragtag_omni
-  endif
-  if exists("b:ragtag_isk")
-    let &l:isk = b:ragtag_isk
-    unlet b:ragtag_isk
-  endif
-  return ""
-endfunction
-
-function! s:subtype()
-  let top = getline(1)."\n".getline(2)
-  if (top =~ '<?xml\>' && &ft !~? 'html') || &ft =~? '^\%(xml\|xsd\|xslt\)$'
-    return "xml"
-  elseif top =~? '\<xhtml\>'
-    return 'xhtml'
-  elseif top =~ '[^<]\<html\>'
-    return "html"
-  elseif &ft == "xhtml" || &ft == "eruby"
-    return "xhtml"
-  elseif exists("b:loaded_ragtag")
-    return "html"
-  else
-    return ""
-  endif
-endfunction
-
-function! s:closetagback()
-  if s:subtype() == "html"
-    return ">\<Left>"
-  else
-    return " />\<Left>\<Left>\<Left>"
-  endif
-endfunction
-
-function! s:closetag()
-  if s:subtype() == "html"
-    return ">"
-  else
-    return " />"
-  endif
-endfunction
-
-function! s:charset()
-  let enc = &fileencoding
-  if enc == ""
-    let enc = &encoding
-  endif
-  if enc == "latin1"
-    return "ISO-8859-1"
-  elseif enc == ""
-    return "US-ASCII"
-  else
-    return enc
-  endif
-endfunction
-
-function! s:tagextras()
-  if s:subtype() == "xml"
-    return ""
-  elseif @" == 'html' && s:subtype() == 'xhtml'
-    let lang = "en"
-    if exists("$LANG") && $LANG =~ '^..'
-      let lang = strpart($LANG,0,2)
-    endif
-    return ' xmlns="http://www.w3.org/1999/xhtml" lang="'.lang.'" xml:lang="'.lang.'"'
-  elseif @" == 'style'
-    return ' type="text/css"'
-  elseif @" == 'script'
-    return ' type="text/javascript"'
-  elseif @" == 'table'
-    return ' cellspacing="0"'
-  else
-    return ""
-  endif
-endfunction
-
-inoremap <silent> <SID>urlspace <C-R>=<SID>getinput()=~?'\%([?&]\<Bar>&amp;\)[%a-z0-9._~+-]*=[%a-z0-9._~+-]*$'?'+':'%20'<CR>
-
-function! s:urltab(htmlesc)
-  let line = s:getinput()
-  let g:line = line
-  if line =~ '[^ <>"'."'".']\@<!\w\+$'
-    return ":"
-  elseif line =~ '[^ <>"'."'".']\@<!\w\+:/\=/\=[%a-z0-9._~+-]*$'
-    return "/"
-  elseif line =~? '\%([?&]\|&amp;\)[%a-z0-9._~+-]*$'
-    return "="
-  elseif line =~? '\%([?&]\|&amp;\)[%a-z0-9._~+-]*=[%a-z0-9._~+-]*$'
-    if a:htmlesc || synIDattr(synID(line('.'),col('.')-1,1),"name") =~ 'mlString$'
-      return "&amp;"
-    else
-      return "&"
-    endif
-  elseif line =~ '/$\|\.\w\+$'
-    return "?"
-  else
-    return "/"
-  endif
-endfunction
-
-function! s:toggleurlescape()
-  let htmllayer = 0
-  if exists("b:ragtag_escape_mode")
-    if b:ragtag_escape_mode == "url"
-      call s:disableescape()
-      return ""
-    elseif b:ragtag_escape_mode == "xml"
-      let htmllayer = 1
-    endif
-    call s:disableescape()
-  endif
-  let b:ragtag_escape_mode = "url"
-  imap     <buffer> <BS> <Plug>ragtagBSUrl
-  inoremap <buffer> <CR> %0A
-  imap <script> <buffer> <Space> <SID>urlspace
-  inoremap <buffer> <Tab> &
-  inoremap <buffer> <Bar> %7C
-  if htmllayer
-    inoremap <silent> <buffer> <Tab> <C-R>=<SID>urltab(1)<CR>
-  else
-    inoremap <silent> <buffer> <Tab> <C-R>=<SID>urltab(0)<CR>
-  endif
-  let i = 33
-  while i < 127
-    " RFC3986: reserved = :/?#[]@ !$&'()*+,;=
-    if nr2char(i) =~# '[|=A-Za-z0-9_.~-]'
-    else
-      call s:urlmap(nr2char(i))
-    endif
-    let i = i + 1
-  endwhile
-  return ""
-endfunction
-
-function! s:urlencode(char)
-  let i = 0
-  let repl = ""
-  while i < strlen(a:char)
-    let repl  = repl . printf("%%%02X",char2nr(strpart(a:char,i,1)))
-    let i = i + 1
-  endwhile
-  return repl
-endfunction
-
-function! s:urlmap(char)
-  let repl = s:urlencode(a:char)
-  exe "inoremap <buffer> ".a:char." ".repl
-endfunction
-
-function! s:urlv()
-  return s:urlencode(nr2char(getchar()))
-endfunction
-
-function! s:togglexmlescape()
-  if exists("b:ragtag_escape_mode")
-    if b:ragtag_escape_mode == "xml"
-      call s:disableescape()
-      return ""
-    endif
-    call s:disableescape()
-  endif
-  let b:ragtag_escape_mode = "xml"
-  imap <buffer> <BS> <Plug>ragtagBSXml
-  inoremap <buffer> <Lt> &lt;
-  inoremap <buffer> >    &gt;
-  inoremap <buffer> &    &amp;
-  inoremap <buffer> "    &quot;
-  return ""
-endfunction
-
-function! s:disableescape()
-  if exists("b:ragtag_escape_mode")
-    if b:ragtag_escape_mode == "xml"
-      silent! iunmap <buffer> <BS>
-      silent! iunmap <buffer> <Lt>
-      silent! iunmap <buffer> >
-      silent! iunmap <buffer> &
-      silent! iunmap <buffer> "
-    elseif b:ragtag_escape_mode == "url"
-      silent! iunmap <buffer> <BS>
-      silent! iunmap <buffer> <Tab>
-      silent! iunmap <buffer> <CR>
-      silent! iunmap <buffer> <Space>
-      silent! iunmap <buffer> <Bar>
-      let i = 33
-      while i < 127
-        if nr2char(i) =~# '[|A-Za-z0-9_.~-]'
-        else
-          exe "silent! iunmap <buffer> ".nr2char(i)
-        endif
-        let i = i + 1
-      endwhile
-    endif
-    unlet b:ragtag_escape_mode
-  endif
-endfunction
-
-function! s:getinput()
-  return strpart(getline('.'),0,col('.')-1)
-endfunction
-
-function! s:bspattern(pattern)
-  let start = s:getinput()
-  let match = matchstr(start,'\%('.a:pattern.'\)$')
-  if match == ""
-    return "\<BS>"
-  else
-    return s:repeat("\<BS>",strlen(match))
-  endif
-endfunction
-
-inoremap <silent> <Plug>ragtagBSUrl     <C-R>=<SID>bspattern('%\x\x\=\<Bar>&amp;')<CR>
-inoremap <silent> <Plug>ragtagBSXml     <C-R>=<SID>bspattern('&#\=\w*;\<Bar><[^><]*>\=')<CR>
-inoremap <silent>  <SID>ragtagUrlEncode <C-R>=<SID>toggleurlescape()<CR>
-inoremap <silent>  <SID>ragtagXmlEncode <C-R>=<SID>togglexmlescape()<CR>
-inoremap <silent> <Plug>ragtagUrlEncode <C-R>=<SID>toggleurlescape()<CR>
-inoremap <silent> <Plug>ragtagXmlEncode <C-R>=<SID>togglexmlescape()<CR>
-inoremap <silent> <Plug>ragtagUrlV      <C-R>=<SID>urlv()<CR>
-inoremap <silent> <Plug>ragtagXmlV      <C-R>="&#".getchar().";"<CR>
-
-if exists("g:ragtag_global_maps")
-  imap     <C-X>H      <Plug>ragtagHtmlComplete
-  imap     <C-X>/    </<Plug>ragtagHtmlComplete
-  imap     <C-X>%      <Plug>ragtagUrlEncode
-  imap     <C-X>&      <Plug>ragtagXmlEncode
-  imap     <C-V>%      <Plug>ragtagUrlV
-  imap     <C-V>&      <Plug>ragtagXmlV
-endif
diff --git a/vim/plugin/ruby_focused_unit_test.vim b/vim/plugin/ruby_focused_unit_test.vim
deleted file mode 100644
index 33e1937..0000000
--- a/vim/plugin/ruby_focused_unit_test.vim
+++ /dev/null
@@ -1,182 +0,0 @@
-if !has("ruby")
-  finish
-end
-
-command RunRubyFocusedUnitTest :call <SID>RunRubyFocusedUnitTest()
-command RunRubyFocusedContext :call <SID>RunRubyFocusedContext()
-command RunAllRubyTests :call <SID>RunAllRubyTests()
-command RunLastRubyTest :call <SID>RunLastRubyTest()
-
-function! s:RunRubyFocusedUnitTest()
-  ruby RubyFocusedUnitTest.new.run_test
-endfunction
-
-function! s:RunRubyFocusedContext()
-  ruby RubyFocusedUnitTest.new.run_context
-endfunction
-
-function! s:RunAllRubyTests()
-  ruby RubyFocusedUnitTest.new.run_all
-endfunction
-
-function! s:RunLastRubyTest()
-  ruby RubyFocusedUnitTest.new.run_last
-endfunction
-
-ruby << EOF
-module VIM
-  class Buffer
-    class << self
-      include Enumerable
-
-      def each(&block)
-        (0...VIM::Buffer.count).each do |index|
-          yield self[index]
-        end
-      end
-
-      def create(name, opts={})
-        location = opts[:location] || :below
-        VIM.command("#{location} new #{name}")
-        buf = VIM::Buffer.current
-        if opts[:text]
-          buf.text = opts[:text]
-        end
-        buf
-      end
-    end
-
-    def text=(content)
-      content.split("\n").each_with_index do |line,index|
-        self.append index, line
-      end
-    end
-
-    def method_missing(method, *args, &block)
-      VIM.command "#{method} #{self.name}"
-    end
-  end
-end
-
-class RubyFocusedUnitTest
-  DEFAULT_OUTPUT_BUFFER = "rb_test_output"
-  SAVED_TEST_COMMAND_FILE = '/tmp/last_ruby_focused_unit_test'
-
-  def write_output_to_buffer(test_command)
-    save_test_command(test_command)
-
-    if buffer = VIM::Buffer.find { |b| b.name =~ /#{DEFAULT_OUTPUT_BUFFER}/ }
-      buffer.bdelete!
-    end
-
-    buffer = VIM::Buffer.create DEFAULT_OUTPUT_BUFFER, :location => :below, :text => "--- Run Focused Unit Test ---\n\n"
-    VIM.command("setlocal buftype=nowrite")
-    VIM.command "redraw"
-
-    IO.popen("#{test_command} 2>&1", "r") do |io|
-      begin
-        loop do
-          input = io.readpartial(10)
-          first, *rest = input.split(/\n/, -1)
-          buffer[buffer.length] = buffer[buffer.length] + first
-          rest.each {|l| buffer.append buffer.length, l }
-          VIM.command "redraw"
-        end
-      rescue EOFError
-      end
-    end
-  end
-
-  def save_test_command(test_command)
-    File.open(SAVED_TEST_COMMAND_FILE, 'w') { |f| f.write(test_command) }
-  end
-
-  def current_file
-    VIM::Buffer.current.name
-  end
-
-  def spec_file?
-    current_file =~ /spec_|_spec/
-  end
-
-  def line_number
-    VIM::Buffer.current.line_number
-  end
-
-  def run_spec
-    write_output_to_buffer("#{spec_command} '#{current_file}' -l #{line_number}")
-  end
-
-  def run_unit_test
-    method_name = nil
-
-    (line_number + 1).downto(1) do |line_number|
-      if VIM::Buffer.current[line_number] =~ /def (test_\w+)/
-        method_name = $1
-        break
-      elsif VIM::Buffer.current[line_number] =~ /test "([^"]+)"/ ||
-            VIM::Buffer.current[line_number] =~ /test '([^']+)'/
-        method_name = "test_" + $1.split(" ").join("_")
-        break
-      elsif VIM::Buffer.current[line_number] =~ /should "([^"]+)"/ ||
-            VIM::Buffer.current[line_number] =~ /should '([^']+)'/
-        method_name = "\"/#{Regexp.escape($1)}/\""
-        break
-      end
-    end
-
-    write_output_to_buffer("ruby #{current_file} -n #{method_name}") if method_name
-  end
-
-  def run_test
-    if spec_file?
-      run_spec
-    else
-      run_unit_test
-    end
-  end
-
-  def run_context
-    method_name = nil
-    context_line_number = nil
-
-    (line_number + 1).downto(1) do |line_number|
-      if VIM::Buffer.current[line_number] =~ /(context|describe) "([^"]+)"/ ||
-         VIM::Buffer.current[line_number] =~ /(context|describe) '([^']+)'/
-        method_name = $2
-        context_line_number = line_number
-        break
-      end
-    end
-
-    if method_name
-      if spec_file?
-        write_output_to_buffer("#{spec_command} #{current_file} -l #{context_line_number}")
-      else
-        method_name = "\"/#{Regexp.escape(method_name)}/\""
-        write_output_to_buffer("ruby #{current_file} -n #{method_name}")
-      end
-    end
-  end
-
-  def run_all
-    if spec_file?
-      write_output_to_buffer("#{spec_command} '#{current_file}'")
-    else
-      write_output_to_buffer("ruby '#{current_file}'")
-    end
-  end
-
-  def run_last
-    write_output_to_buffer(File.read(SAVED_TEST_COMMAND_FILE))
-  end
-
-  def spec_command
-    if File.exists?("Gemfile") && match = `bundle show rspec`.match(/(\d\.\d\.\d)$/)
-      match.to_a.last.to_f < 2 ? "bundle exec spec" : "bundle exec rspec"
-    else
-      system("rspec -v > /dev/null 2>&1") ? "rspec --no-color" : "spec"
-    end
-  end
-end
-EOF
diff --git a/vimrc b/vimrc
index 3d0808b..de9a147 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,6 @@
 " Use tpope's pathogen plugin to manage all other plugins
-call pathogen#runtime_append_all_bundles()
+runtime bundle/tpope-vim-pathogen/autoload/pathogen.vim
+call pathogen#infect()
 call pathogen#helptags()
 
 "Use Vim settings, rather then Vi settings (much better!).