My layout, etc
Merge commit '8cec0bc9d66cb7da4770e6502e97a426908eb532' into salj_layout

* commit '8cec0bc9d66cb7da4770e6502e97a426908eb532':
  Fix typo of variable name
  Add TMK converter support to Next converter
  Adhoc fix compile error of usb_usb
  usb_usb: Remove mention of downloading LUFA
  usb_usb: Remove mention of merged usb_hid branch