Merge remote-tracking branch 'origin/master' into develop

fix handwired/swiftrax/beegboy keymaps (#11071)

Co-authored-by: Swiftrax <swiftrax@gmail.com>

fix handwired/swiftrax/bebol keymaps (#11072)

Co-authored-by: Swiftrax <swiftrax@gmail.com>

Merge remote-tracking branch 'origin/master' into develop

Moved default LALT and LWIN for BKS65 (#11087)

Merge remote-tracking branch 'origin/master' into develop

Adding bootleg and waffling60 rev b (#10846)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

Merge remote-tracking branch 'origin/master' into develop

nix-shell: add milc dependency (#11086)

Merge remote-tracking branch 'origin/master' into develop

Added VIA keymap to YMDK bface keyboard (#11002)

Co-authored-by: Ryan <fauxpark@gmail.com>

Merge remote-tracking branch 'origin/master' into develop

Reduce travis load by replacing an exclusive grep with an inclusive grep (#10964)

* add -n to avoid compiling

* switch to an include rather than exclude strategy

Branch point for 2021 Feb 27 Breaking Change

Configurable serial usart timeout (#11057)

Fix int wrapping for timer_expired macros and use MAX defines for consistency and clarity (#10996)

[Keyboard] Add edc40 keyboard (#11021)

* Re-adding edc40 keyboard branch/files

* Update keymap.c

* add default keymap for edc40

* removed redundant keymap

* added custom keymap for edc40

* fixed false update to settings.json

* fixed false update to settings.json

* added newline to info.json

* Update keyboards/edc40/config.h

* Update keyboards/edc40/readme.md

* Update keyboards/edc40/rules.mk

* Update rules.mk

* Update keyboards/edc40/info.json

* Update info.json

* Update info.json

* Update keyboards/edc40/config.h

* Update keyboards/edc40/info.json

* Update keyboards/edc40/readme.md

* Update keyboards/edc40/keymaps/default/keymap.c

KBD67 Rev2 VIA: Increase layer count from 2 to 4 (#11039)

map reset key to the correct location (#11037)

Co-authored-by: Anand Babu (AB) Periasamy <twitter.com/abperiasamy>

Updated README name (#11033)