Update to latest ryanlchan/chosen branch (Option-adding branch)