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