Some fixes and cleanup of the GPG module, Addition of a new gpg state module.
makefile update at Thu Nov 20 16:20:34 CST 2014
makefile update at Thu Nov 20 16:28:00 CST 2014
makefile update at Thu Nov 20 16:45:44 CST 2014
Merge pull request #18327 from garethgreenaway/gpg_fixes_new_gpg_state

Fixes to gpg module, addition of gpg state module.
Merge pull request #18357 from tjyang/develop

enable "make cheatsheet"
merge w/ develop