Merge branch 'custom-vimrc'