Add support for .zshrc.local + small assorted fixes.