# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1403940318 14400
# Node ID fe92c4dbfd4529775eed87fc08b753f5d19f2a6f
# Parent  04dfcc1f5eb64513473cbaf8565eb97f9e5209ca# Parent  4a38df9bd773171752999fbf95bfa94f45a2e00a
Merge from default

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -58,6 +58,7 @@ end
   Plugin 'Shougo/vimproc.vim'
   Plugin 'Shougo/unite.vim'
   Plugin 'Shougo/vimshell.vim'
+  Plugin 'Shougo/vimfiler.vim'
   Plugin 'sjl/gundo.vim'
   Plugin 'majutsushi/tagbar'
   Plugin 'godlygeek/tabular'
@@ -65,9 +66,13 @@ end
   Plugin 'tpope/vim-unimpaired'
   Plugin 'tpope/vim-endwise'
 
-  Plugin 'danchoi/ri.vim'
   Plugin 'tpope/vim-fugitive'
   Plugin 'ludovicchabant/vim-lawrencium'
+  Plugin 'mhinz/vim-signify'
+
+  Plugin 'danchoi/ri.vim'
+  Plugin 'vim-ruby/vim-ruby'
+  Plugin 'vim-perl/vim-perl'
 
   if installed_vundle == 1
     echo "Installing Plugins, please ignore key map error messages"
@@ -85,7 +90,7 @@ end
 
 " Key maps, mostly plugin stuff on F-keys  {{{
 nmap <silent> <F1> :Unite buffer<CR>
-nmap <silent> <F2> :Unite file<CR>
+nmap <silent> <F2> :VimFilerExplorer<CR>
 nmap <silent> <F3> :VimShell<CR>
 map  <silent> <F4> :noh<CR>
 nmap <silent> <F5> :GundoToggle<CR>
@@ -286,8 +291,21 @@ if executable('ag')
   let g:unite_source_grep_recursive_opt = ''
 endif
 
+" > vimfiler
+let g:vimfiler_as_default_explorer = 1
+autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file)
+
 " > Airline
 let g:airline#extensions#whitespace#enabled = 0
+
+" > Signify
+let g:signify_disable_by_default = 1
+let g:signify_vcs_list = [ 'git', 'hg' ]
+
+let g:signify_mapping_next_hunk = '<leader>gj'
+let g:signify_mapping_prev_hunk = '<leader>gk'
+let g:signify_mapping_toggle = '<leader>gt'
+
 " }}}
 
 
@@ -305,7 +323,10 @@ if has('gui_running')
   set nu
   set bg=dark
 
-  set columns=120 lines=40
+  if on_windows == 1
+    " generally have a tiling wm on linux
+    set columns=120 lines=40
+  end
 
   colorscheme solarized
 else