Fix --no-ff for real usage, Pull Request #136 clowntown by me thanks @nem75