progress on #201

Still need more work on twitter/github proxies

Also to address hkp stuff