Add config file API handling
Tidy up API config file stuff
Update README to reflect API management changes
Update API key stuff and fix merge conflict