fixed merge conflict
move gpg file
move back
get rid of mac gpg rc file
add gpg thing for mac
update catalyst config
ignore the gpg.rc and use symlink