Add nginx syntax & autocmd setting
Merge master & the remote origin/master