Add the pyzo channel to .condarc
Merge branch 'master' of github.com:asmeurer/dotfiles