Merge remote-tracking branch 'tmk/master' into cub_layout

diff --combined README.md
index 2695b629fe99c8919fe6066c30288c503db8765a,a01de8c6f81a4d14b9340524f9f3d9c1f222aa7a..f4d1eed238fe32018af452fda0bb660122455a7a
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -53,7 -53,6 +53,7 @@@ You can find some keyboard specific pro
  * [macway](keyboard/macway/)                - [Compact keyboard mod][GH_macway] [retired]
  * [KMAC](keyboard/kmac/)                    - Korean custom keyboard
  * [Lightsaber](keyboard/lightsaber/)        - Korean custom keyboard
 +* [ErgoDox](keyboard/ergodox/)              - [ergonomic keyboard with split design][GH_ergodox] (see [Ergodox-FAQ.md](keyboard/ergodox/Ergodox-FAQ.md))
  
  [GH_macway]:    http://geekhack.org/showwiki.php?title=Island:11930
  [GH_hhkb]:      http://geekhack.org/showwiki.php?title=Island:12047
@@@ -66,7 -65,6 +66,7 @@@
  [GH_x68k]:      http://geekhack.org/showwiki.php?title=Island:29060
  [GH_hbkb]:      http://geekhack.org/showwiki.php?title=Island:29483
  [GH_ibm4704]:   http://geekhack.org/index.php?topic=54706.0
 +[GH_ergodox]:   http://geekhack.org/index.php?topic=48106.0
  [HID_liber]:    http://deskthority.net/wiki/HID_Liberation_Device_-_DIY_Instructions
  [Phantom]:      http://geekhack.org/index.php?topic=26742
  [GH60]:         http://geekhack.org/index.php?topic=34959
@@@ -153,6 -151,7 +153,7 @@@ To avoid configuring accidentally addit
  - Disable Gui(`Left Gui`)
  - Swap Grave and Escape(`Grave`)
  - Swap BackSlash and BackSpace(`Back Slash`)
+ - Enable NKRO on boot(`N`)
  
  #### Default Layer
  - Set Default Layer to 0(`0`)