Merge branch 'master' of github.com:thermes/dotfiles
add ~/.rbenv/bin and ~/local/bin to .zshrc