Keyboard tags added
Merge branch 'keyboard-tags' into gh-pages
Revert "Merge branch 'keyboard-tags' into gh-pages"

This reverts commit 622f171376d24703097f479a9cc0b8c7cacf9e62.
Merge branch 'keyboard-tags' into gh-pages