Put together zshrc, update README
pull and resolve