moving gpg keys into sub dirs
cleanup
adding puppetlabs repositories