remove no-ff
fix osx .zshrc
fix readme