Revert "auto-hiding status bar, mark 1"

This reverts commit 221e4ef4ef95f2fc25e8fbc5f9e146c6f3885ce1.
Search for the conflict line marker immediately

This is a vim-only syntax, but then I don't care so much since $EDITOR will
probably (evil 1.0 in Emacs is kinda nice....) always be vim :)
feh & compton during xinitrc
Merge branch 'master' of github.com:evaryont/dotfiles