Update key addition process to handle AWS keypair files. Also allow keys
to be deleted if for some reason a vpc has not been set