vimrc: statusline tweak

Signed-off-by: Adrian-Tudor Panescu <adrian.tudor.panescu@cern.ch>
gitconfig: pull/ merge aliases

* ff-only is the default option.

Signed-off-by: Adrian-Tudor Panescu <adrian.tudor.panescu@cern.ch>