Use opendiff as difftool
Add a line for pyenv in .zshrc
Merge branch 'master' of https://github.com/rorokeeffe/dotfiles