Vim: use hybrid line numbering
Vim: stop mapping W to w (messes with / mode)
Git: add ff alias for fast-forward merging
Git: add mb and mbm aliases (merge-base)