Incorporate libsodium option and linkage, generalize, update packaging.
Merge branch 'evoskuil/master'
Merge pull request #964 from evoskuil/master

Incorporate libsodium option and linkage, generalize, update packaging.