Manually merged vimrc content with 'testing' branch