Small updates to the README.
Merged conflicts with new parameters.
Added documentation for new config parameters.
Fixed a small typo.