Incorporate libsodium option and linkage, generalize, update packaging.
Merge branch 'evoskuil/master'