Bug 880330 - Refactor the shell to use the new options API; r=bholley