Update unite_complete setting, add EOL '/', git merge config --no-edit and auto git merge test 'vim-snippets'