Merge pull request #138 from Robert-Nelson/integration-tests

Port continuous integration from master branch.
Merge pull request #139 from Robert-Nelson/keyring

Reworked keyring and added new keyring bundle
Fix make bundle-test and keyring unit-tests