Symlink documented config location to new location
Add notice to config about location of plugin settings
Update config file links and organise
Add provider merging support for AWS