Starting to flush out the cryptoki stuff, although I'm not sure I like it yet.
Merge pull request #1 from swaj/master

Starting to flush out the cryptoki stuff, although I'm not sure I like i...