Makefile clenaup; vim gpg support