Always order keyboard by primary-first
Fix minor typo
Merge pull request #238 from jvc26/keyboard-order

Always order keyboard by primary-first
Fix for cellcounter/cellcounter#234
Merge pull request #239 from jvc26/cellcounter/cellcounter#234

Fix for cellcounter/cellcounter#234