Latest QMK Firmware

migrate from qmk branches

* no longer need to keep branches synced on top of master
  * independent of submodule shenanigans in upstream
* update boards from breaking changes since whenver the last time I
  touched the keymaps was