Feature/update config with key

Most of these commits were due to me reverting changes back to your branch status. I'm now creating feature branches which will allow for easier pull requests.

This pull request will allow make to update the config files with relevant key id's.