merge dry-run fixes

* Allow `-o` to not be specified in `dry-run` mode;  
Also print warning in case both `-o` and `-d` are specified.
* Codespell fixes.