comment out some cnoremap
Merge branch 'master' of github.com:linyows/dotfiles

* 'master' of github.com:linyows/dotfiles:
  update oh-my-zsh
  add puppet syntax