Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7

diff --cc build_keyboard.mk
Simple merge

diff --cc quantum/config_common.h
index f3897dc2ce76f0eee920feddaa65337c47da8380,4d3939dae17ee718245a6a28988494cc8f6334ef..17c11faeb617e1fbaeae12af7622f6c4c429c10e
--- 1/quantum/config_common.h
--- 2/quantum/config_common.h
+++ b/quantum/config_common.h
@@@ -77,53 -76,7 +77,7 @@@
          } while(0)
  #   else
  #       error "USART configuration is needed."
- #endif
- 
- // I'm fairly sure these aren't needed, but oh well - Jack
- 
- /*
-  * PS/2 Interrupt configuration
-  */
- #ifdef PS2_USE_INT
- /* uses INT1 for clock line(ATMega32U4) */
- #define PS2_CLOCK_PORT  PORTD
- #define PS2_CLOCK_PIN   PIND
- #define PS2_CLOCK_DDR   DDRD
- #define PS2_CLOCK_BIT   1
- 
- #define PS2_DATA_PORT   PORTD
- #define PS2_DATA_PIN    PIND
- #define PS2_DATA_DDR    DDRD
- #define PS2_DATA_BIT    0
- 
- #define PS2_INT_INIT()  do {    \
-     EICRA |= ((1<<ISC11) |      \
-               (0<<ISC10));      \
- } while (0)
- #define PS2_INT_ON()  do {      \
-     EIMSK |= (1<<INT1);         \
- } while (0)
- #define PS2_INT_OFF() do {      \
-     EIMSK &= ~(1<<INT1);        \
- } while (0)
- #define PS2_INT_VECT    INT1_vect
- #endif
- 
- /*
-  * PS/2 Busywait configuration
-  */
- #ifdef PS2_USE_BUSYWAIT
- #define PS2_CLOCK_PORT  PORTD
- #define PS2_CLOCK_PIN   PIND
- #define PS2_CLOCK_DDR   DDRD
- #define PS2_CLOCK_BIT   1
- 
- #define PS2_DATA_PORT   PORTD
- #define PS2_DATA_PIN    PIND
- #define PS2_DATA_DDR    DDRD
- #define PS2_DATA_BIT    0
- #endif
- 
+ #   endif
  #endif
  
 -#endif
 +#endif

diff --cc readme.md
Simple merge