Merge pull request #418 from reaperhulk/move-contexts

Move ciphercontext/aeadciphercontext to bottom of symmetric encryption