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

diff --combined keyboards/ergodox/ez/config.h
index f532b2d5af66a19c80ac24acae607b4093f7b38c,a3dc5bf152ad1a09ca2186ea3a013346119e7c29..2e273eb9733aedb9e9e49446b3d991433886a258
--- 1/keyboards/ergodox/ez/config.h
--- 2/keyboards/ergodox/ez/config.h
+++ b/keyboards/ergodox/ez/config.h
@@@ -52,11 -52,12 +52,13 @@@ along with this program.  If not, see <
  #define RGB_MIDI
  #define RGBW_BB_TWI
  
 +#define RGBW 1
  
  /* Set 0 if debouncing isn't needed */
  #define DEBOUNCE    5
  
+ #define USB_MAX_POWER_CONSUMPTION 50
+ 
  /*
   * Feature disable options
   *  These options are also useful to firmware size reduction.