Merge branch 'master' of github.com:tmk/tmk_keyboard

Increase buffer size of PS2 protocol

Add support of Model F 122 terminal keyboard

- change initialize of keyboard in matrix_scan()
- keymap for 122 keys
- Mafilefie and config.h for LUFA and PS/2 USART

Merge pull request #30 from Wraul/phantom_debounce_fix

Fix debouncing on Phantom.

Fix debouncing on Phantom.

Fix doc of Boot Magic and add another project info

Fix doc and descriptor of iwrap

Add vusb support to iwrap

Merge pull request #29 from Wraul/update_phantom

Update Phantom for new keymap framework

Adjust Phantom layouts formating.

Make the layout formating better match that of GH60.

Updated Phantom for new keymap framework.

Merge branch 'iwrap5'

Add support of mouse horizontal wheel to iWRAP

Rescue script from iWRAP MUX mode stuck

Fix build options for NEWS converter

Add support of iWRAP5

- mouse virtical wheel
- consumer page

Fix LUFA host driver for unconfigured state

Fix USB Descriptors

Remove common/controller_teensy.h

Add  new build options on m0110_usb