diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index cb3e6e39..2aa43a69 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -1,3 +1,9 @@
+[difftool "winmerge"]
+    cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)"
+    trustExitCode = false
+[difftool "p4merge"]
+    cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)"
+    trustExitCode = false
 [mergetool "p4merge"]
     cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)" 
     trustExitCode = false
diff --git a/.gitignore b/.gitignore
index d2907491..d3ddc045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .vim/undo/
 .vim/.netrwhist
-
+.vim/bundle/*
+!.vim/bundle/Vundle.vim
diff --git a/.gitmodules b/.gitmodules
index 7799fb56..b7900e0e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,70 +1,18 @@
-[submodule ".vim/bundle/vim-fugitive"]
-	path = .vim/bundle/vim-fugitive
-	url = http://github.com/tpope/vim-fugitive
-[submodule ".vim/bundle/vim-markdown"]
-	path = .vim/bundle/vim-markdown
-	url = https://github.com/plasticboy/vim-markdown.git
-[submodule ".vim/bundle/vim-powerline"]
-	path = .vim/bundle/vim-powerline
-	url = https://github.com/Lokaltog/vim-powerline.git
-[submodule ".vim/bundle/vim-syntastic"]
-	path = .vim/bundle/vim-syntastic
-	url = https://github.com/scrooloose/syntastic
 [submodule "cygwin/mintty-colors-solarized"]
 	path = cygwin/mintty-colors-solarized
 	url = https://github.com/mavnn/mintty-colors-solarized.git
-[submodule ".vim/bundle/salt-vim"]
-	path = .vim/bundle/salt-vim
-	url = https://github.com/saltstack/salt-vim.git
-[submodule ".vim/bundle/vim-airline"]
-	path = .vim/bundle/vim-airline
-	url = https://github.com/bling/vim-airline
-[submodule ".vim/bundle/vim-gitgutter"]
-	path = .vim/bundle/vim-gitgutter
-	url = https://github.com/airblade/vim-gitgutter
-[submodule ".vim/bundle/vim-colors-solarized"]
-	path = .vim/bundle/vim-colors-solarized
-    url = https://github.com/cyplo/vim-colors-solarized.git
-
 [submodule ".oh-my-zsh"]
 	path = .oh-my-zsh
 	url = git://github.com/robbyrussell/oh-my-zsh.git
-[submodule ".vim/bundle/nerdtree"]
-	path = .vim/bundle/nerdtree
-	url = https://github.com/scrooloose/nerdtree
-[submodule ".vim/bundle/vim-ctrlp"]
-	path = .vim/bundle/vim-ctrlp
-	url = https://github.com/kien/ctrlp.vim.git
 [submodule "tools/icdiff.git"]
 	path = tools/icdiff.git
 	url = https://github.com/jeffkaufman/icdiff.git
-[submodule ".vim/bundle/splice"]
-	path = .vim/bundle/splice
-	url = https://github.com/sjl/splice.vim.git
-[submodule ".vim/bundle/vim-dirdiff"]
-	path = .vim/bundle/vim-dirdiff
-	url = git://github.com/will133/vim-dirdiff
 [submodule "tools/subuser"]
 	path = tools/subuser
 	url = https://github.com/subuser-security/subuser
 [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"]
 	path = .oh-my-zsh-plugins/zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule ".vim/bundle/rust.vim"]
-	path = .vim/bundle/rust.vim
-	url = https://github.com/rust-lang/rust.vim.git
-[submodule ".vim/bundle/racer"]
-	path = .vim/bundle/racer
-	url = https://github.com/phildawes/racer.git
-[submodule ".vim/bundle/YouCompleteMe"]
-	path = .vim/bundle/YouCompleteMe
-	url = https://github.com/Valloric/YouCompleteMe.git
-[submodule ".vim/bundle/ack.vim"]
-	path = .vim/bundle/ack.vim
-	url = https://github.com/mileszs/ack.vim.git
-[submodule ".vim/bundle/vim-cargo"]
-	path = .vim/bundle/vim-cargo
-	url = https://github.com/timonv/vim-cargo.git
-[submodule ".vim/bundle/vim-dispatch"]
-	path = .vim/bundle/vim-dispatch
-	url = https://github.com/tpope/vim-dispatch.git
+[submodule ".vim/bundle/Vundle.vim"]
+	path = .vim/bundle/Vundle.vim
+	url = https://github.com/VundleVim/Vundle.vim.git
diff --git a/.setenv b/.setenv
index c5b25623..706c22bb 100644
--- a/.setenv
+++ b/.setenv
@@ -11,3 +11,5 @@ export PATH=$HOME/.cargo/bin:$PATH
 export RUST_SRC_PATH=$HOME/dev/rust/src
 export EDITOR="vim"
 export KEYTIMEOUT=1
+export VAGRANT_DEFAULT_PROVIDER=virtualbox
+
diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim
deleted file mode 100644
index 7b89ccaf..00000000
--- a/.vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,326 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.2
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc 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
-
-function! s:warn(msg)
-  echohl WarningMsg
-  echomsg a:msg
-  echohl NONE
-endfunction
-
-" Point of entry for basic default usage.  Give a relative path to invoke
-" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
-" pathogen#surround().  For backwards compatibility purposes, a full path that
-" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
-" instead.
-function! pathogen#infect(...) abort " {{{1
-  for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
-    if path =~# '^[^\\/]\+$'
-      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
-      call pathogen#incubate(path . '/{}')
-    elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
-      call pathogen#incubate(path)
-    elseif path =~# '[\\/]\%({}\|\*\)$'
-      call pathogen#surround(path)
-    else
-      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
-      call pathogen#surround(path . '/{}')
-    endif
-  endfor
-  call pathogen#cycle_filetype()
-  return ''
-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 (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
-      call remove(a:list,i)
-    elseif a:list[i] ==# ''
-      let i += 1
-      let empty = 1
-    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
-
-" Check if a bundle is disabled.  A bundle is considered disabled if it ends
-" in a tilde or its basename or full name is included in the list
-" g:pathogen_disabled.
-function! pathogen#is_disabled(path) " {{{1
-  if a:path =~# '\~$'
-    return 1
-  elseif !exists("g:pathogen_disabled")
-    return 0
-  endif
-  let sep = pathogen#separator()
-  let blacklist = g:pathogen_disabled
-  return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
-endfunction "}}}1
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory.  If the directory is already included, move it to the
-" outermost position.  Wildcards are added as is.  Ending a path in /{} causes
-" all subdirectories to be added (except those in g:pathogen_disabled).
-function! pathogen#surround(path) abort " {{{1
-  let sep = pathogen#separator()
-  let rtp = pathogen#split(&rtp)
-  if a:path =~# '[\\/]{}$'
-    let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
-    let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
-    let after  = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
-    call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  else
-    let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
-    let before = [path]
-    let after = [path . sep . 'after']
-    call filter(rtp, 'index(before + after, v:val) == -1')
-  endif
-  let &rtp = pathogen#join(before, rtp, after)
-  return &rtp
-endfunction " }}}1
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.  Deprecated.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
-  return pathogen#surround(a:path . pathogen#separator() . '{}')
-endfunction " }}}1
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended.  If the argument ends in '/{}', add a separate entry for
-" each subdirectory.  The default argument is 'bundle/{}', which means that
-" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
-" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
-" UNIX).
-function! pathogen#incubate(...) abort " {{{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$'
-      if name =~# '{}$'
-        let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
-      else
-        let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
-      endif
-    else
-      if name =~# '{}$'
-        let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*'), '!pathogen#is_disabled(v:val)')
-      else
-        let list += [dir . sep . name, dir]
-      endif
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction " }}}1
-
-" Deprecated alias for pathogen#incubate().
-function! pathogen#runtime_append_all_bundles(...) abort " {{{1
-  if a:0
-    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
-  else
-    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
-  endif
-  return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
-endfunction
-
-let s:done_bundles = ''
-" }}}1
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort " {{{1
-  let sep = pathogen#separator()
-  for glob in pathogen#split(&rtp)
-    for dir in split(glob(glob), "\n")
-      if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
-        silent! execute 'helptags' pathogen#fnameescape(dir.'/doc')
-      endif
-    endfor
-  endfor
-endfunction " }}}1
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command.  This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort " {{{1
-  for command in a:000
-    execute command
-  endfor
-  return ''
-endfunction " }}}1
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort "{{{1
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  let file = findfile(a:file,rtp,a:count)
-  if file ==# ''
-    return ''
-  else
-    return fnamemodify(file,':p')
-  endif
-endfunction " }}}1
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort " {{{1
-  if exists('*fnameescape')
-    return fnameescape(a:string)
-  elseif a:string ==# '-'
-    return '\-'
-  else
-    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
-  endif
-endfunction " }}}1
-
-if exists(':Vedit')
-  finish
-endif
-
-let s:vopen_warning = 0
-
-function! s:find(count,cmd,file,lcd) " {{{1
-  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
-  let file = pathogen#runtime_findfile(a:file,a:count)
-  if file ==# ''
-    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
-  endif
-  if !s:vopen_warning
-    let s:vopen_warning = 1
-    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
-  else
-    let warning = ''
-  endif
-  if a:lcd
-    let path = file[0:-strlen(a:file)-2]
-    execute 'lcd `=path`'
-    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
-  else
-    return a:cmd.' '.pathogen#fnameescape(file) . warning
-  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 path = expand(path, ':p')
-    let matches = split(glob(path.sep.pattern),"\n")
-    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
-    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
-    for match in matches
-      let found[match] = 1
-    endfor
-  endfor
-  return sort(keys(found))
-endfunction " }}}1
-
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
-command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
-
-" vim:set et sw=2:
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
new file mode 160000
index 00000000..49847675
--- /dev/null
+++ b/.vim/bundle/Vundle.vim
@@ -0,0 +1 @@
+Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
deleted file mode 160000
index 94ec3ed9..00000000
--- a/.vim/bundle/YouCompleteMe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 94ec3ed902e4e55b1766232d3b0e7d602bc2c472
diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim
deleted file mode 160000
index 0a7d28bf..00000000
--- a/.vim/bundle/ack.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0a7d28bfb130696f73d122cac99d8903e066c896
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
deleted file mode 160000
index f8fd2ecc..00000000
--- a/.vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f8fd2ecce20f5005e6313ce57d6d2a209890c946
diff --git a/.vim/bundle/racer b/.vim/bundle/racer
deleted file mode 160000
index 063094b9..00000000
--- a/.vim/bundle/racer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 063094b977ce6c415f91e939626f334982c0a0a3
diff --git a/.vim/bundle/rust.vim b/.vim/bundle/rust.vim
deleted file mode 160000
index 115d321d..00000000
--- a/.vim/bundle/rust.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 115d321d383eb96d438466c56cc871fcc1bd0faa
diff --git a/.vim/bundle/salt-vim b/.vim/bundle/salt-vim
deleted file mode 160000
index bdfd0a55..00000000
--- a/.vim/bundle/salt-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bdfd0a558898df77aa8fc4c7b142062fdee3b2f7
diff --git a/.vim/bundle/splice b/.vim/bundle/splice
deleted file mode 160000
index 4d322d82..00000000
--- a/.vim/bundle/splice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4d322d823563f6fd2d72c129b1e99f5a98060fa8
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
deleted file mode 160000
index 246c2175..00000000
--- a/.vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 246c217562dfd8541ee0d64600a628daa4195dd2
diff --git a/.vim/bundle/vim-cargo b/.vim/bundle/vim-cargo
deleted file mode 160000
index fbf907c3..00000000
--- a/.vim/bundle/vim-cargo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fbf907c353eaafdf4a270f66c1bb6aad767d874f
diff --git a/.vim/bundle/vim-colors-solarized b/.vim/bundle/vim-colors-solarized
deleted file mode 160000
index b1f234b8..00000000
--- a/.vim/bundle/vim-colors-solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b1f234b8aa879a8276fc2c73c99ec68d7635de96
diff --git a/.vim/bundle/vim-ctrlp b/.vim/bundle/vim-ctrlp
deleted file mode 160000
index b5d3fe66..00000000
--- a/.vim/bundle/vim-ctrlp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
diff --git a/.vim/bundle/vim-dirdiff b/.vim/bundle/vim-dirdiff
deleted file mode 160000
index 779185c3..00000000
--- a/.vim/bundle/vim-dirdiff
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4
diff --git a/.vim/bundle/vim-dispatch b/.vim/bundle/vim-dispatch
deleted file mode 160000
index 5f5c22c9..00000000
--- a/.vim/bundle/vim-dispatch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
deleted file mode 160000
index 0374322b..00000000
--- a/.vim/bundle/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0374322ba5d85ae44dd9dc44ef31ca015a59097e
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
deleted file mode 160000
index 39f01190..00000000
--- a/.vim/bundle/vim-gitgutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39f011909620e0c7ae555efdace20c3963ac88af
diff --git a/.vim/bundle/vim-markdown b/.vim/bundle/vim-markdown
deleted file mode 160000
index 74c9c607..00000000
--- a/.vim/bundle/vim-markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 74c9c60796ef10284ba26aaf38ffb39beae5f62c
diff --git a/.vim/bundle/vim-syntastic b/.vim/bundle/vim-syntastic
deleted file mode 160000
index 64cce208..00000000
--- a/.vim/bundle/vim-syntastic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 64cce208388c10debd5b150de08d9be371bd0e86
diff --git a/.vimrc b/.vimrc
index 7284ed47..912ef225 100755
--- a/.vimrc
+++ b/.vimrc
@@ -20,6 +20,9 @@ nmap <leader>t :wa <bar> :Make test<CR>
 " navigate buffers by ctrl-b
 nmap <C-b> :bprevious<CR>
 
+" YCM
+nnoremap <Leader>g :YcmCompleter GoTo<CR>
+
 nnoremap ; :
 
 " no cheating !
@@ -45,10 +48,37 @@ set shiftwidth=4
 set expandtab
 
 " plugins
-execute pathogen#infect()
+
+filetype off 
+
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'VundleVim/Vundle.vim'
+
+Plugin 'https://github.com/cyplo/vim-colors-solarized.git'
+Plugin 'mileszs/ack.vim'
+Plugin 'scrooloose/nerdtree.git'
+Plugin 'scrooloose/syntastic.git'
+Plugin 'wting/rust.vim'
+Plugin 'sjl/splice.vim.git'
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
+Plugin 'timonv/vim-cargo'
+Plugin 'kien/ctrlp.vim'
+Plugin 'will133/vim-dirdiff'
+Plugin 'tpope/vim-dispatch.git'
+Plugin 'tpope/vim-fugitive.git'
+Plugin 'tpope/vim-sensible'
+Plugin 'airblade/vim-gitgutter.git'
+Plugin 'godlygeek/tabular'
+Plugin 'plasticboy/vim-markdown'
+Plugin 'Valloric/YouCompleteMe'
+
+call vundle#end()
 filetype plugin indent on
 
-" colours [need pathogen]
+" colours
 set t_Co=256
 syntax enable
 set background=dark
diff --git a/.zshrc b/.zshrc
index 924388c3..d5eba57f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -45,6 +45,8 @@ else
     alias tscp="torsocks scp"
 fi
 
+alias benice="ionice -c3 nice -n20"
+
 # env vars
 source ~/.setenv
 
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..58c4c013
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,2 @@
+install: powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1"
+build_script: windows_cygwin\build.bat
diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system
index a792e7cb..60820f23 100755
--- a/bunsen/configure_fresh_system
+++ b/bunsen/configure_fresh_system
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 set -e
-set -v
 
 sudo apt-get update
 sudo apt-get -y upgrade
@@ -15,15 +14,11 @@ done
 set -e
 eval $install_packages
 
-if [[ -z $DONT_START_TOR ]]; then
+if [[ -z $NO_SYSTEMCTL ]]; then
 	sudo systemctl enable tor
 	sudo systemctl start tor
 fi
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DIR="$DIR/../"
-DIR="$DIR" $DIR/common/configure_fresh_system
-
 # install vim from sources
 VIM_BUILD_DIR=/tmp
 cd "$VIM_BUILD_DIR"
@@ -42,3 +37,8 @@ sudo make install
 cd
 rm -fvr "$VIM_BUILD_DIR/vim"
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$DIR/../"
+DIR="$DIR" $DIR/common/configure_fresh_system
+
+
diff --git a/bunsen/test_insider b/bunsen/test_insider
index d1612fb6..8e653f4d 100755
--- a/bunsen/test_insider
+++ b/bunsen/test_insider
@@ -4,7 +4,7 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
-export DONT_START_TOR=true
+export NO_SYSTEMCTL=true
 
 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries
 
diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index d949971a..4fc49505 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 set -e
-set -v
 echo
 echo "configuring settings common among OSes"
 sudo true
@@ -44,10 +43,6 @@ ln -vfs "$DIR/.config/redshift.conf" ~/.config/redshift.conf
 
 source ~/.setenv
 
-cd "$DIR/.vim/bundle/YouCompleteMe/"
-git submodule update --init --recursive
-python install.py --clang-completer
-
 # symlink 'nodejs' as node on some systems
 # will replace symlink if it exists, but won't replace regular file
 if [[ ! -f /usr/bin/node ]]; then
@@ -83,18 +78,20 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 cd "$DIR/../"
 echo "getting rust sources..."
 if [[ ! -d rust ]]; then
-    git clone https://github.com/rust-lang/rust.git
+    git clone https://github.com/rust-lang/rust.git --recursive
 else
     cd rust 
     git pull
+    git submodule update --init --recursive
 fi
 
-set +e
-cargo uninstall rustfmt
-cargo uninstall racer
-set -e
-cargo install rustfmt
-cargo install racer
+cargo install -f rustfmt
+
+echo "\n" | vim +PluginInstall +qa
+
+cd "$DIR/.vim/bundle/YouCompleteMe/"
+git submodule update --init --recursive
+./install.py --racer-completer --clang-completer
 
 # go
 export GOPATH="$HOME/go"
diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system
index fed9f69b..b7089cd7 100755
--- a/fedora/configure_fresh_system
+++ b/fedora/configure_fresh_system
@@ -4,19 +4,30 @@ set -e
 
 #software and shell
 sudo dnf -y upgrade --best --allowerasing
-sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop
+sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic
 FEDORA_VERSION=`rpm -E %fedora`
 sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
 sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
-sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang
+sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs kicad retext
 sudo dnf -y groupinstall "C Development Tools and Libraries"
 
-if [[ -z $DONT_START_TOR ]]; then
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+sudo cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak
+sudo cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf
+set +e
+sudo diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf
+set -e
+
+if [[ -z $NO_SYSTEMCTL ]]; then
+    sudo systemctl enable dnf-automatic.timer
+    sudo systemctl start  dnf-automatic.timer
+    sudo systemctl list-timers "*dnf-*"
+
     sudo systemctl enable tor
     sudo systemctl start tor
 fi
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system
 
diff --git a/fedora/etc/dnf/automatic.conf b/fedora/etc/dnf/automatic.conf
new file mode 100644
index 00000000..d5bed173
--- /dev/null
+++ b/fedora/etc/dnf/automatic.conf
@@ -0,0 +1,46 @@
+[commands]
+#  What kind of upgrade to perform:
+# default                            = all available upgrades
+# security                           = only the security upgrades
+upgrade_type = security
+random_sleep = 300
+
+# Whether updates should be downloaded when they are available.
+download_updates = yes
+
+# Whether updates should be applied when they are available.
+# Note that if this is set to no, downloaded packages will be left in the
+# cache regardless of the keepcache setting.
+apply_updates = yes
+
+
+[emitters]
+# Name to use for this system in messages that are emitted.  Default is the
+# hostname.
+# system_name = my-host
+
+# How to send messages.  Valid options are stdio, email and motd.  If
+# emit_via includes stdio, messages will be sent to stdout; this is useful
+# to have cron send the messages.  If emit_via includes email, this
+# program will send email itself according to the configured options.
+# If emit_via includes motd, /etc/motd file will have the messages.
+# Default is email,stdio.
+emit_via = stdio,email
+
+
+[email]
+# The address to send email messages from.
+email_from = root
+
+# List of addresses to send messages to.
+email_to = admin@cyplo.net
+
+# Name of the host to connect to to send email messages.
+email_host = localhost
+
+
+[base]
+# This section overrides dnf.conf
+
+# Use this to filter DNF core messages
+debuglevel = 1
diff --git a/fedora/install_freecad_dependencies b/fedora/install_freecad_dependencies
index 8ec3a001..4292f342 100755
--- a/fedora/install_freecad_dependencies
+++ b/fedora/install_freecad_dependencies
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo dnf install cmake doxygen swig gettext dos2unix desktop-file-utils libXmu-devel freeimage-devel mesa-libGLU-devel OCE-devel python python-devel python-pyside-devel pyside-tools boost-devel tbb-devel eigen3-devel qt-devel qt-webkit-devel ode-devel xerces-c xerces-c-devel opencv-devel smesh-devel freetype freetype-devel boost-devel Coin3-devel
+sudo dnf install cmake doxygen swig gettext dos2unix desktop-file-utils libXmu-devel freeimage-devel mesa-libGLU-devel OCE-devel python python-devel python-pyside-devel pyside-tools boost-devel tbb-devel eigen3-devel qt-devel qt-webkit-devel ode-devel xerces-c xerces-c-devel opencv-devel smesh-devel freetype freetype-devel boost-devel Coin3-devel vtk-devel med-devel
diff --git a/fedora/test_insider b/fedora/test_insider
index 496329b8..e31efca7 100755
--- a/fedora/test_insider
+++ b/fedora/test_insider
@@ -3,7 +3,7 @@
 set -e
 
 export DONT_CHANGE_SHELL=true
-export DONT_START_TOR=true
+export NO_SYSTEMCTL=true
 
 dnf -y install sudo
 
diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system
index 8039ff40..01b80361 100755
--- a/ubuntu/configure_fresh_system
+++ b/ubuntu/configure_fresh_system
@@ -5,7 +5,7 @@ set -v
 
 sudo apt-get update
 sudo apt-get -y upgrade
-install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs thunderbird thunderbird-enigmail gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3 gnupg2 realpath apt-file"
+install_packages="sudo apt-get -y --fix-missing install apt-file apt-fileaptitude aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag solaar terminator thunderbird thunderbird-enigmail thunderbird-ublock-origin tmux tor torsocks vim whois zsh"
 
 set +e
 for i in `seq 1 3`; do
@@ -15,7 +15,7 @@ done
 set -e
 eval $install_packages
 
-if [[ -z $DONT_START_TOR ]]; then
+if [[ -z $NO_SYSTEMCTL ]]; then
 	sudo systemctl enable tor
 	sudo systemctl start tor
 fi
diff --git a/ubuntu/test_insider b/ubuntu/test_insider
index 55aa9929..1234fce0 100755
--- a/ubuntu/test_insider
+++ b/ubuntu/test_insider
@@ -4,7 +4,7 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
-export DONT_START_TOR=true
+export NO_SYSTEMCTL=true
 
 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries
 
diff --git a/windows_cygwin/README.md b/windows_cygwin/README.md
new file mode 100644
index 00000000..cc3c8bb3
--- /dev/null
+++ b/windows_cygwin/README.md
@@ -0,0 +1,19 @@
+Bootstrap from cmd.exe running as Administrator:
+
+    @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cyplo/dotfiles/master/windows_cygwin/bootstrap.ps1'))"
+
+launch a normal user's cmd.exe and:
+
+    refreshenv
+    ssh-keygen -b 8192
+    type .ssh\id_rsa.pub
+    # add this key to github
+    mkdir dev
+    cd dev
+    git clone git@github.com:cyplo/dotfiles.git
+
+launch new cmd.exe as Administrator and:
+    
+    cd %HOMEPATH%\dev\dotfiles
+    windows_cygwin\build.bat
+
diff --git a/windows_cygwin/bootstrap.ps1 b/windows_cygwin/bootstrap.ps1
new file mode 100644
index 00000000..dbec7a91
--- /dev/null
+++ b/windows_cygwin/bootstrap.ps1
@@ -0,0 +1,3 @@
+iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex
+choco install -y git win32-openssh
+
diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat
new file mode 100644
index 00000000..94f1c10f
--- /dev/null
+++ b/windows_cygwin/build.bat
@@ -0,0 +1,5 @@
+choco install -y firefox googlechrome wget
+wget -c https://cygwin.com/setup-x86_64.exe
+REM cygwin installation
+setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion
+