[from now] 2014/08/22 18:32:18

diff --git a/.gnuplot b/.gnuplot
index 1a6fdcd..6b692e5 100644
--- a/.gnuplot
+++ b/.gnuplot
@@ -1,14 +1,8 @@
 reset

-<<<<<<< HEAD
-set terminal x11 enhanced font ',10' # persist
-# set terminal pngcairo size 640,360 enhanced font 'DejaVuSansMono,8'
-# set output "output.png"
-=======
 # set terminal x11 enhanced font ',10' persist
 set terminal pngcairo size 640,360 enhanced font 'DejaVuSansMono,8'
 set output "plot.png"
->>>>>>> 92e7926771d6ba34a41248581355c1ac972145c4

 set label "gnuplot" at screen 0.987,0.99 rotate by -90 font ",6" textcolor rgb "#808080"

diff --git a/.vimrc b/.vimrc
index bd7bad2..855cc08 100644
--- a/.vimrc
+++ b/.vimrc
@@ -99,8 +99,6 @@ Bundle 'tomasr/molokai'

 filetype plugin indent on

-
-
 "}}}

 "========================================
@@ -215,6 +213,7 @@ nnoremap            <C-k><C-n> :bn<CR>
 nnoremap            <C-k><C-d> :bw!<CR>
 nnoremap            <C-k><C-k> @s
 nnoremap            s          q
+nnoremap            <Tab>      :vs<CR>
 nnoremap            q          :bw!<CR>
 nnoremap            ;          :
 nnoremap            ,          <C-w><C-w>
@@ -320,7 +319,7 @@ nnoremap <silent> <Space>u   :<C-u>Unite -no-split file_mru<CR>

 "****************************************
 " vimfiler.vim
-nnoremap <silent> <Space>.   :<C-u>VimFilerBufferDir -quit<CR>
+nnoremap <silent> <Space>.   :<C-u>VimFilerBufferDir -force-quit<CR>

 " if executable('grep')
   " let g:unite_source_grep_command       = 'grep'