Merge in some more tasks; cleanup .zshrc