Added correct lines for vim-links; major reformatting