Merge pull request #436 from evoskuil/master

Integrate libsodium and other linkage options and update package.