Fixed Makefile and main

Other things are possibly broken from the modifications
Merge branch 'master' of https://github.com/calccrypto/OpenPGP