Remove keys that are no longer used for merging
Also updated trusted git root to be right after gmaxwell's last merge.