Accommodate explicit libsodium configure switch

This update primarily accommodates the update applied by libzmq #914 which which provides the ability to explicitly specify a requirement for libsodium using --with-libsodium (line 138).

All other changes are pretty printing updates to remove linter warnings (eg. line length).