Fixed merge errors that I didn't notice.
Removed a stray period from the usage message.
Updated usage message in the README.