add nginx conf syntax plugin
Merge branch 'master' of https://github.com/wanghaidong/dotfiles

* 'master' of https://github.com/wanghaidong/dotfiles:
  add company intranet static ip set scripts
  add java and android sdk, nodejs install scripts
  change osx config script timezone setting to tokyo
  update ssh config
  restore using full vim with --quiet option