Merge remote-tracking branch 'refs/remotes/origin/master'

diff --combined awesome/topbar.lua
index b816365f2c247581f3b566eb30b0c01252fb3a98,7986af062689ae0f357d1f6e3a0e298e2fbc2984..4d5d50546d28b9cae5cc6e6f17143366f610af25
--- 1/awesome/topbar.lua
--- 2/awesome/topbar.lua
+++ b/awesome/topbar.lua
@@@ -89,11 -89,9 +89,9 @@@ for s = 1, screen.count() d
      local right_layout = wibox.layout.fixed.horizontal()
      if s == 1 then right_layout:add(wibox.widget.systray()) end
      right_layout:add(separator)
-     right_layout:add(require("widgets/pomodoro"))
-     right_layout:add(separator)
      right_layout:add(require("widgets/awesompd"))
      right_layout:add(require("widgets/volume_widget"))
 -    if utils.host == "chronos" then
 +    if utils.has_battery() then
          right_layout:add(separator)
          right_layout:add(require("widgets/battery_widget"))
      end

diff --combined vim/vimrc
index 933806716e92557e5b4191a10fd934a010ebd03d,636350fbe3c076766d263a126ab905992104370d..47529e3c4152be3ef740ad6b43c02943ae205013
--- 1/vim/vimrc
--- 2/vim/vimrc
+++ b/vim/vimrc
@@@ -72,6 -72,7 +72,7 @@@ Plugin 'derekwyatt/vim-protodef
  " needs editing colorscheme
  " Plugin 'jeaye/color_coded'
  " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
+ Plugin 'wincent/loupe'
  
  call vundle#end()
  
@@@ -156,10 -157,18 +157,18 @@@ set mouse=rnv                   " list 
  set ttymouse=xterm              " type of mouse
  
  " messages and info {{{2
- set showcmd                     " Show (partial) command in status line.
- set ruler                       " show the cursor position all the time
- set confirm                     " Ask what to do when closing unsaved documents
- set shortmess=filnxtoOI         " don't show intro message
+ set showcmd         " Show (partial) command in status line.
+ set ruler           " show the cursor position all the time
+ set confirm         " Ask what to do when closing unsaved documents
+ set shortmess=      " reset option
+ set shortmess+=a    " all abbreviations
+ set shortmess+=o    " overwrite file-written message
+ set shortmess+=O    " file-read message overrides previous
+ set shortmess+=t    " truncate file message at start
+ set shortmess+=T    " truncate other messages in the middle
+ set shortmess+=W    " don't give 'written' or '[w]' when writing a file
+ set shortmess+=A    " ignore swapfile warning
+ set shortmess+=I    " no splash screen
  
  " editing text {{{2
  set backspace=indent,eol,start  " allow backspacing over everything in insert mode
@@@ -435,9 -444,9 +444,9 @@@ nnoremap zx zMzxz
  
  map <F1> :ls<CR>:b<space>
  
 -" move between windows
 -nnoremap <C-L> <C-W>w
 -nnoremap <C-H> <C-W>W
 +" move between windows (skip previewwindow)
 +nnoremap <silent> <C-L> <C-W>w:if &previewwindow \| wincmd w \| endif<CR>
 +nnoremap <silent> <C-H> <C-W>W:if &previewwindow \| wincmd W \| endif<CR>
  
  "xterm mouse with middleclick paste
  nnoremap <MiddleMouse> i<MiddleMouse>
@@@ -647,7 -656,7 +656,7 @@@ let g:unite_source_grep_max_candidates 
  if executable('ag')
      " Use ag in unite grep source.
      let g:unite_source_grep_command = 'ag'
 -    let g:unite_source_grep_default_opts = '--smart-case --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
 +    let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
      let g:unite_source_grep_recursive_opt = ''
  end
  nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
@@@ -656,7 -665,7 +665,7 @@@ command! -nargs=1 Ag Unite grep:.::<arg
  " unite-file_rec {{{3
  if executable('ag')
      " Use ag in unite rec source
 -    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
 +    let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', '']
  end
  nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
  call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')