add puppet syntax
Merge branch 'master' of github.com:linyows/dotfiles

* 'master' of github.com:linyows/dotfiles:
  update oh-my-zsh
  show Rails.env if Rails is defined
  change yank plugin
  change remap
  update
  update oh-my-zsh and vundle
update oh-my-zsh