Fixed issue 470, crypto_test still forcing libsodium when NaCL is chosen
Merge pull request #502 from stqism/issue-470-fix

Fixed issue #470, crypto_test still forcing libsodium when NaCL is chosen
fixed space handling in commands (issue #495)
Merge pull request #503 from rose-m/issue-495-fix

fixed space handling in commands (issue #495)
Merge branch 'master' into refactor
More refactoring done.