Bug 880330 - Refactor crypto to use the new options API; r=bholley
Bug 880330 - Remove the old options API; r=bholley