Merge pull request #24 from jschlyter/master

wrap long lines
Merge branch 'master' of github.com:jschlyter/SoftHSMv2
Merge pull request #25 from jschlyter/master

use umask to restrict file permissions and apply stricter permissions on new file
Merge remote-tracking branch 'upstream/master'