updating README and config.py
minor changes to config.py and merging changes from develop