Merge pull request #714 from hintjens/master

Cleaned up the code
Add new tests to CMakeLists.txt
Merge pull request #715 from ricnewton/master

Add new tests to CMakeLists.txt
Fixed man page for CURVE key options