This contains both the matrix number and key position, in preparation for multi-matrix support
* fixes from tmk's repo * rename keyboard to keyboards