# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1403878103 14400
# Node ID 04dfcc1f5eb64513473cbaf8565eb97f9e5209ca
# Parent  fc73a8086da56a0d8b665b7768ac9231fc7089a3# Parent  29dc361680716db9c6c09fd309281dfd52b1d2c3
Merge from default

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -4,6 +4,7 @@ merge = vimdiff
 
 [extensions]
 hgext.graphlog = 
+mq = 
 rebase = 
 color = 
 record = 
@@ -21,6 +22,7 @@ fetch = pull --rebase
 [merge-tools]
 vimdiff.executable = vim
 vimdiff.args = -d $base $local $output $other +close +close
+vimdiff.check = changed, conflicts
 
 
 %include ~/.hgrc.local
diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -62,6 +62,8 @@ end
   Plugin 'majutsushi/tagbar'
   Plugin 'godlygeek/tabular'
   Plugin 'tomtom/tcomment_vim'
+  Plugin 'tpope/vim-unimpaired'
+  Plugin 'tpope/vim-endwise'
 
   Plugin 'danchoi/ri.vim'
   Plugin 'tpope/vim-fugitive'
@@ -132,6 +134,9 @@ set expandtab
 set shiftwidth=2
 set softtabstop=2
 
+" apparently you have to go out of your way to make this stick
+autocmd BufNewFile,BufRead * setlocal formatoptions-=ro
+
 set backspace=indent,eol,start
 
 "set nu
@@ -271,9 +276,9 @@ let g:tagbar_type_perl = {
 
 
 " > Unite
-call unite#filters#matcher_default#use(['matcher_fuzzy'])
+" call unite#filters#matcher_default#use(['matcher_fuzzy'])
 call unite#filters#sorter_default#use(['sorter_rank'])
-let g:unite_source_history_yank_enable = 1
+" let g:unite_source_history_yank_enable = 1
 
 if executable('ag')
   let g:unite_source_grep_command = 'ag'