Some minor change

These modification allow user to reuse api key accross container deployments (For potential upgrade)
this probably shouldn't be stored in a world readable directory.  also, the new version (beta coming within two weeks) will remove the agent so hopefully we will eliminate some of this pain :)