Readd removed vimrc settings that were temporarily disabled while investigating Fufbuffer error