Replaced the way the hkpplus module gets recognized.
changes in the hkpplus submodule
 and finally some other minor changes and cleanup

Signed-off-by: Thomas Spycher <tspycher@zerodine.com>