git diff HEAD..HEAD^
diff --git a/vim/general.vim b/vim/general.vim
index cae0f68..ecb6382 100644
--- a/vim/general.vim
+++ b/vim/general.vim
@@ -1,7 +1,5 @@
-scriptencoding utf-8
-
 " Basic Settings
-let g:mapleader = ','
+let mapleader = ","
 filetype plugin indent on
 syntax on
 runtime macros/matchit.vim
@@ -18,7 +16,9 @@ set tabstop=2
 set mouse=
 set conceallevel=2
 set autoindent
+set encoding=utf-8
 set scrolloff=3
+set showcmd
 set hidden
 set wildmenu
 set wildmode=longest:list,full
@@ -45,7 +45,7 @@ set wrap
 set linebreak
 set nolist
 set formatoptions=qrn1
-if exists('+spelllang')
+if exists("+spelllang")
   set spelllang=en_us
 endif
 set spellfile=~/.vim/spell/en.utf-8.add
@@ -55,16 +55,16 @@ set noswapfile
 set tags=tags
 set path=.
 " Session settings
-set sessionoptions-=options " don't store global and local values in a session
-set sessionoptions-=folds   " don't store folds
+set ssop-=options    " do not store global and local values in a session
+set ssop-=folds      " do not store folds
 set splitbelow
 set splitright
-set statusline+=%{ConflictedVersion()} " TODO: add to airline
+set stl+=%{ConflictedVersion()}
 set diffopt+=vertical
 
 " base16 vim
-if filereadable(expand('~/.vimrc_background'))
-  let g:base16colorspace=256
+if filereadable(expand("~/.vimrc_background"))
+  let base16colorspace=256
   source ~/.vimrc_background
 endif
 

git diff HEAD..HEAD^ --color
[38;5;227mdiff --git a/vim/general.vim b/vim/general.vim[m
[38;5;227mindex cae0f68..ecb6382 100644[m
[38;5;227m--- a/vim/general.vim[m
[38;5;227m+++ b/vim/general.vim[m
[1;35m@@ -1,7 +1,5 @@[m
[1;31m-scriptencoding utf-8[m
[1;31m-[m
 " Basic Settings[m
[1;31m-let g:mapleader = ','[m
[1;32m+[m[1;32mlet mapleader = ","[m
 filetype plugin indent on[m
 syntax on[m
 runtime macros/matchit.vim[m
[1;35m@@ -18,7 +16,9 @@[m [mset tabstop=2[m
 set mouse=[m
 set conceallevel=2[m
 set autoindent[m
[1;32m+[m[1;32mset encoding=utf-8[m
 set scrolloff=3[m
[1;32m+[m[1;32mset showcmd[m
 set hidden[m
 set wildmenu[m
 set wildmode=longest:list,full[m
[1;35m@@ -45,7 +45,7 @@[m [mset wrap[m
 set linebreak[m
 set nolist[m
 set formatoptions=qrn1[m
[1;31m-if exists('+spelllang')[m
[1;32m+[m[1;32mif exists("+spelllang")[m
   set spelllang=en_us[m
 endif[m
 set spellfile=~/.vim/spell/en.utf-8.add[m
[1;35m@@ -55,16 +55,16 @@[m [mset noswapfile[m
 set tags=tags[m
 set path=.[m
 " Session settings[m
[1;31m-set sessionoptions-=options " don't store global and local values in a session[m
[1;31m-set sessionoptions-=folds   " don't store folds[m
[1;32m+[m[1;32mset ssop-=options    " do not store global and local values in a session[m
[1;32m+[m[1;32mset ssop-=folds      " do not store folds[m
 set splitbelow[m
 set splitright[m
[1;31m-set statusline+=%{ConflictedVersion()} " TODO: add to airline[m
[1;32m+[m[1;32mset stl+=%{ConflictedVersion()}[m
 set diffopt+=vertical[m
 [m
 " base16 vim[m
[1;31m-if filereadable(expand('~/.vimrc_background'))[m
[1;31m-  let g:base16colorspace=256[m
[1;32m+[m[1;32mif filereadable(expand("~/.vimrc_background"))[m
[1;32m+[m[1;32m  let base16colorspace=256[m
   source ~/.vimrc_background[m
 endif[m
 [m
git config pager.diff
git config pager.show