Cleanup the use of the keystore

Signed-off-by: Gary Pamparà <gpampara@gmail.com>
Merge branch 'master' of github.com:fgeldenhuys/cyborg