add template dir for git hooks and update oh-my-zsh
merge with remote
npmrc and ignore for vim rwhist
merge with template dir added
resolve merge