Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware

diff --cc keyboard/ergodox_ez/keymaps/osx_de/keymap.c
index a1b47ae8be5d67d33222cc8b0dd12200ba50518b,269e7a0fbd62eb9abab284c5a0de227c56644861..dffcb21da3db485d84fa30f05160419b0fc40d61
--- 1/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
--- 2/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
@@@ -13,11 -13,10 +13,11 @@@
  #define M_CTRL_CMDV 1
  #define M_CTRL_CMDC 2
  #define M_MEH_SH_ACUT 3
- #define M_DE_PLUS_CTRLALT 12
- #define M_DE_CIRC_CTRLCMD 13
+ #define M_DE_OSX_PLUS_CTRLALT 12
+ #define M_DE_OSX_CIRC_CTRLCMD 13
  #define M_TOGGLE_5 14
  #define M_CTL_SFT_HASH 15
 +#define M_LGUI_SHFT 16
  
  #define SM_SMILE 4
  #define SM_SMIRK 5