Adding/removing public keys

@mpdavis please review