Minor vimrc adds/fixes. set incsearch ttyfast and highlight VCS conflict markers. Fix array append.
Added xscreensaveer preferences to Xresources.