better idempotency on failure

when GPG fails (due to a downed keyserver, for example), the key does not get added and it does not retry the next time due to it not being triggered because the template file already exists. This makes it check for existence using apt-key list. 

This also includes the keyserver attribute patch since I couldn't figure out how to separate them...