Clean up the lumina-config keyboard detection routine a bit more.
Merge branch 'master' of github.com:pcbsd/pcbsd