Makes keyboard navigation include items in optgroups

Navigating by up and down arrow works better now.
Merge branch 'keyboard-nav-including-groups' into frique-master