Merge config files, update readme