Refactor aes ni
Merge pull request #113 from nerdrew/aesni-refactor

Refactor aes ni