Reorganized VIM configuration, and several simple fixes.