Merge branch 'master' of http://gitlab.rez/lhark/rc

vimrc

@@ -74,7 +74,8 @@ if has("unix") || has("mac")
         else
             Plugin 'AutoComplPop'
         endif
-        Plugin 'bling/vim-airline'
+        Plugin 'vim-airline/vim-airline-themes'
+        Plugin 'vim-airline/vim-airline'
         Plugin 'godlygeek/tabular'
         Plugin 'kien/ctrlp.vim'
         Plugin 'Lokaltog/vim-easymotion'
@@ -254,7 +255,7 @@ set matchpairs=":"
 set matchpairs+=(:)
 set matchpairs+={:}
 set matchpairs+=[:]
-set matchpairs+=<:>
+"set matchpairs+=<:> : too annoying
 "[Turn backup off and value of history]"
 set nobackup
 set noswapfile