Cleaned up code related to configuration options.

Added configuration options to README.md