Conflicts: oh-my-zsh.sh
Add missing newlines at EOF. Remove redundant comment. Fix grammar in comment.