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

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c