Merge branch 'master'

Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c

1 files changed, 28 insertions, 18 deletions

diff --git a/keyboards/readme.md b/keyboards/readme.md
index e979865467..81a23c7e55 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -9,37 +9,47 @@ These keyboards are manufactured by the maintainers of QMK.
 
 What makes OLKB keyboards shine is a combo of lean aesthetics, compact size, and killer tactile feel. These are available through [olkb.com](http://olkb.com) as well as through [Massdrop](http://massdrop.com) from time to time, as easy to assemble kits.
 
-* [Planck](/keyboards/planck/) - A 40% DIY powerhouse of customizability and modification capability. It's a lean, mean, typing machine.
-* [Preonic](/keyboards/preonic/) - Like the Planck, but bigger. 50%.
-* [Atomic](/keyboards/atomic/) - Imagine the size of the Planck. Now imagine the size of the Preonic. Now imagine _bigger_. That is the Atomic. A 60% keyboard.
+* [Planck](/keyboards/planck/) — A 40% DIY powerhouse of customizability and modification capability. It's a lean, mean, typing machine.
+* [Preonic](/keyboards/preonic/) — Like the Planck, but bigger. 50%.
+* [Atomic](/keyboards/atomic/) — Imagine the size of the Planck. Now imagine the size of the Preonic. Now imagine _bigger_. That is the Atomic. A 60% keyboard.
 
 ### ErgoDox EZ - Erez Zukerman
 
 Made in Taiwan using advanced robotic manufacturing, the ErgoDox EZ is a fully-assembled, premium ergonomic keyboard. Its split design allows you to place both halves shoulder width, and its custom-made wrist rests and tilt/tent kit make for incredibly comfortable typing. Available on [ergodox-ez.com](https://ergodox-ez.com).
 
-* [ErgoDox EZ](/keyboards/ergodox_ez/) - Our one and only product. Yes, it's that awesome. Comes with either printed or blank keycaps, and 7 different keyswitch types.
+* [ErgoDox EZ](/keyboards/ergodox/) — Our one and only product. Yes, it's that awesome. Comes with either printed or blank keycaps, and 7 different keyswitch types.
 
 ### Clueboard - Zach White
 
 Designed and built in Felton, CA, Clueboards keyboard emphasize quality and locally sourced components, available on [clueboard.co](http://clueboard.co)
 
-* [Clueboard](/keyboards/clueboard/) - The 66% custom keyboard.
-* [Cluepad](/keyboards/cluepad/) - A mechanical numpad with QMK superpowers.
+* [Clueboard](/keyboards/clueboard/) — The 66% custom keyboard.
+* [Cluecard](/keyboards/cluecard/) — A small board to help you hack on QMK.
+* [Cluepad](/keyboards/cluepad/) — A mechanical numpad with QMK superpowers.
 
 
 ## Community-supported QMK Keyboards
 
 These keyboards are part of the QMK repository, but their manufacturers are not official maintainers of the repository.
 
-* [alps64](/keyboards/alps64/) — A 60% keyboard for Alps keyswitches.
-* [arrow_pad](/keyboards/arrow_pad) — A custom creation by IBNobody.
-* [atreus](/keyboards/atreus) — Made by Technomancy.
-* [bantam44](/keyboards/bantam44) — It is a 44-key 40% staggered keyboard.
-* [gh60](/keyboards/gh60) — A 60% Geekhack community-driven project.
-* [hhkb](/keyboards/hhkb) — The Happy Hacking keyboard can be hacked with a custom controller to run QMK.
-* [jd45](/keyboards/jd45) — Another Geekhack community project, designed by jdcarpe.
-* [kc60](/keyboards/kc60) — A programmable Chinese-made keyboard, lost in the mists of time.
-* [phantom](/keyboards/phantom) — A tenkeyless kit by Teel, also from Geekhack.
-* [retro_refit](/keyboards/retro_refit) — Another creation by IBNobody.
-* [satan](/keyboards/satan) — A GH60 variant.
-* [sixkeyboard](/keyboards/sixkeyboard) — A 6-key keyboard made by TechKeys.
+* [Alps64](/keyboards/alps64) — A 60% keyboard for Alps keyswitches.
+* [AMJ60](/keyboards/amj60) — DIY/Assembled compact 60% keyboard.
+* [Arrow Pad](/keyboards/arrow_pad) — A custom creation by IBNobody.
+* [Atreus](/keyboards/atreus) — Made by Technomancy.
+* [Bantam44](/keyboards/bantam44) — It is a 44-key 40% staggered keyboard.
+* [Ergodox Infinity](/keyboards/ergodox) - Ergonomic Split Keyboard by Input Club.
+* [GH60](/keyboards/gh60) — A 60% Geekhack community-driven project.
+* [Happy Hacking Keyboard](/keyboards/hhkb) — The Happy Hacking keyboard can be hacked with a custom controller to run QMK.
+* [Infinity 60%](/keyboards/infinity60) - — Compact community keyboard by Input Club.
+* [JD45](/keyboards/jd45) — Another Geekhack community project, designed by jdcarpe.
+* [KC60](/keyboards/kc60) — A programmable Chinese-made keyboard, lost in the mists of time.
+* [Kinesis Advantage](/keyboards/kinesis) — Contoured ergonomic keyboard by Kinesis Computer Ergonomics.
+* [The Kitten Paw](/keyboards/kitten_paw) — A replacement controller (2016 revision) for the Filco Majestouch by [Bathroom Epiphanies](https://github.com/BathroomEpiphanies).
+* [Lets Split](/keyboards/lets_split) - Split ortholinear 40% keyboard.
+* [Phantom](/keyboards/phantom) — A tenkeyless kit by Teel, also from Geekhack.
+* [Retro Refit](/keyboards/retro_refit) — Another creation by IBNobody.
+* [S60-x](/keyboards/s60-x) — DIY compact keyboard designed by VinnyCordeiro for Sentraq.
+* [Satan](/keyboards/satan) — A GH60 variant.
+* [SixKeyBoard](/keyboards/sixkeyboard) — A 6-key keyboard made by TechKeys.
+* [TheVan 44](/keyboars/tv44) — A 44-key staggered keybard by Evangs.
+* [Vision Division](/keyboards/vision_division) — Full Size / Split Linear Keyboard by IBNobody.