adding slimmed down config file
updates to the readme
readme conflicts