Merge pull request #12 from jfwood/master

Adding prototype crypto handler code.
fix comment string syntax, trim trailing whitespace
Merge pull request #13 from reaperhulk/master

fix comment string syntax, trim trailing whitespace
Tweaks to http client test code...works a little better now;