Merge pull request #5 from jackhumbert/master

Sync with upstream

96 files changed, 12270 insertions, 3174 deletions

diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile
index e90dcedb67..7634c4280e 100644
--- a/keyboard/alps64/Makefile
+++ b/keyboard/alps64/Makefile
@@ -53,9 +53,9 @@ SRC =	keymap_common.c \
 	led.c
 
 ifdef KEYMAP
-    SRC := keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP).c $(SRC)
 else
-    SRC := keymap_plain.c $(SRC)
+    SRC := keymaps/default.c $(SRC)
 endif
 
 CONFIG_H = config.h
diff --git a/keyboard/alps64/keymap_plain.c b/keyboard/alps64/keymaps/default.c
index a54899196a..a54899196a 100644
--- a/keyboard/alps64/keymap_plain.c
+++ b/keyboard/alps64/keymaps/default.c
diff --git a/keyboard/alps64/keymap_hasu.c b/keyboard/alps64/keymaps/hasu.c
index d297d72fea..d297d72fea 100644
--- a/keyboard/alps64/keymap_hasu.c
+++ b/keyboard/alps64/keymaps/hasu.c
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile
index e678b4efa8..da6d0ac60c 100644
--- a/keyboard/atomic/Makefile
+++ b/keyboard/atomic/Makefile
@@ -54,9 +54,9 @@ SRC = atomic.c \
 	backlight.c 
 
 ifdef KEYMAP
-    SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP).c $(SRC)
 else
-    SRC := keymaps/keymap_default.c $(SRC)
+    SRC := keymaps/default.c $(SRC)
 endif
 
 CONFIG_H = config.h
diff --git a/keyboard/atomic/README.md b/keyboard/atomic/README.md
index c8e83cf55a..0e42370ba6 100644
--- a/keyboard/atomic/README.md
+++ b/keyboard/atomic/README.md
@@ -16,10 +16,10 @@ Depending on which keymap you would like to use, you will have to compile slight
 To build with the default keymap, simply run `make`.
 
 ### Other Keymaps
-Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
+Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a file in the keymaps folder named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
 
 To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like:
 ```
 $ make KEYMAP=[default|jack|<name>]
 ```
-Keymaps follow the format **__keymap\_\<name\>.c__** and are stored in the `keymaps` folder.
+Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
diff --git a/keyboard/atomic/keymaps/keymap_abienz.c b/keyboard/atomic/keymaps/abienz.c
index 589a64dc4e..589a64dc4e 100644
--- a/keyboard/atomic/keymaps/keymap_abienz.c
+++ b/keyboard/atomic/keymaps/abienz.c
diff --git a/keyboard/atomic/keymaps/keymap_default.c b/keyboard/atomic/keymaps/default.c
index f37d9d9a51..f37d9d9a51 100644
--- a/keyboard/atomic/keymaps/keymap_default.c
+++ b/keyboard/atomic/keymaps/default.c
diff --git a/keyboard/atomic/keymaps/keymap_michelle.c b/keyboard/atomic/keymaps/michelle.c
index 2364c46a15..2364c46a15 100644
--- a/keyboard/atomic/keymaps/keymap_michelle.c
+++ b/keyboard/atomic/keymaps/michelle.c
diff --git a/keyboard/atreus/Makefile b/keyboard/atreus/Makefile
index 2e542d62ed..a6fddd70d2 100644
--- a/keyboard/atreus/Makefile
+++ b/keyboard/atreus/Makefile
@@ -53,9 +53,9 @@ TARGET_DIR = .
 SRC = atreus.c
 
 ifdef KEYMAP
-    SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP).c $(SRC)
 else
-    SRC := keymaps/keymap_default.c $(SRC)
+    SRC := keymaps/default.c $(SRC)
 endif
 
 ifdef TEENSY2
diff --git a/keyboard/atreus/README.md b/keyboard/atreus/README.md
index 4db7ac1203..aacf2841f4 100644
--- a/keyboard/atreus/README.md
+++ b/keyboard/atreus/README.md
@@ -177,10 +177,10 @@ Depending on which keymap you would like to use, you will have to compile slight
 To build with the default keymap, simply run `make`.
 
 ### Other Keymaps
-Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
+Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
 
 To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like:
 ```
 $ make KEYMAP=[default|jack|<name>]
 ```
-Keymaps follow the format **__keymap\_\<name\>.c__** and are stored in the `keymaps` folder.
+Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
diff --git a/keyboard/atreus/keymaps/keymap_default.c b/keyboard/atreus/keymaps/default.c
index 1c4280ff56..1c4280ff56 100644
--- a/keyboard/atreus/keymaps/keymap_default.c
+++ b/keyboard/atreus/keymaps/default.c
diff --git a/keyboard/atreus/keymaps/keymap_gerb.c b/keyboard/atreus/keymaps/gerb.c
index 1ba3942e3b..1ba3942e3b 100644
--- a/keyboard/atreus/keymaps/keymap_gerb.c
+++ b/keyboard/atreus/keymaps/gerb.c
diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md
new file mode 100644
index 0000000000..984106ff46
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md
@@ -0,0 +1,29 @@
+# ErgoDox EZ Dvorak International Squisher
+
+Dvorak layout adjusted with several (linux) applications in mind:
+
+* Easier Escape for VIM
+* Windows/Super key for awesome WM
+* Alt+Shift for international characters
+* PrintScreen for sys-rq
+* Insert for the X11 clip-board
+
+Major layer changes:
+
+* Common multimedia keys are integrated into layer 0, less common into layer 1
+* No mouse keys
+* Layer 2 is qwerty (for easier gaming & less fortunate keyboard users)
+
+Known issues:
+
+* Alt+Shift does not work reliably (depends on the X11 kb layout? Not
+  entirely clear...)
+
+![layer0](keyboard-layout0.png)
+![layer1](keyboard-layout1.png)
+![layer2](keyboard-layout2.png)
+
+## Changelog
+
+* 2016-03-29
+  * Initial release
diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex
new file mode 100644
index 0000000000..bd70f5829f
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex
@@ -0,0 +1,1127 @@
+:100000000C9465020C94AC020C94AC020C94AC02FF

+:100010000C94AC020C94AC020C94AC020C94AC02A8

+:100020000C94AC020C94AC020C94B50B0C94870CA1

+:100030000C94AC020C94AC020C94AC020C94AC0288

+:100040000C94AC020C943B210C94AC020C94AC02CA

+:100050000C94AC020C94C71A0C94AC020C94AC0235

+:100060000C94AC020C94AC020C94AC020C94AC0258

+:100070000C94AC020C94AC020C94AC020C94AC0248

+:100080000C94AC020C94AC020C94AC020C94AC0238

+:100090000C94AC020C94AC020C94AC020C94AC0228

+:1000A0000C94AC020C94AC020C94AC02F40C160D43

+:1000B000040E160D040E5B0D7E0D040ED30DE60D21

+:1000C000D110D11000110011431181119A139A130C

+:1000D0009A119A139B129B126E139A139A138513FB

+:1000E0000000F0A12E0029002A00E1003581000067

+:1000F0001E00340004003371E2004D001F00360082

+:1001000012001400E3002B002000370008000D004F

+:1001100050002C002100130018000E004F004A0070

+:1001200022001C000C001B0000006571B6004C0092

+:100130000000007F00000154AE004900000000777D

+:1001400000000254230009000700050000004600DB

+:1001500024000A000B00100052004B00250006008E

+:1001600017001A0051002800260015001100190080

+:100170002F00E51427000F0016001D7130004E00FF

+:10018000318238002D00E500C100000001000100AF

+:1001900001000100010000003A001E0220022202BC

+:1001A000010001003B001F022102230201000100A7

+:1001B0003C002F0226022F00AC0001003D0030025F

+:1001C00027023000AB0001003E003102350035024D

+:1001D000000001000100010000000100000001001A

+:1001E0000100010000000100000001003F0052007A

+:1001F00051002402000001004000240021001E00E4

+:100200000100A9004100250022001F003700010065

+:1002100042002600230020002700A80043002502FA

+:100220002E0231002E00AA0044004500010001000A

+:1002300001000000010001000100010001000000B8

+:100240000100140004001D710100010001001A00EA

+:1002500016001B0001000100010008000700060055

+:100260000100010001001500090019000100010052

+:10027000010017000A000500000001000100010054

+:100280000000010000000100010001000000010069

+:100290000000010001001C000B0011000000010023

+:1002A000010018000D0010000100010001000C0009

+:1002B0000E00360001000100010012000F0037009F

+:1002C00001000100010013003382387101000100B8

+:1002D00001000100010001000100000016034500BB

+:1002E000720067006F0044006F0078002000450036

+:1002F0005A00000016034500720067006F004400BA

+:100300006F007800200045005A0000000403090433

+:1003100009026D00040100A0FA09040000010301B4

+:100320000100092111010001223F00070581030896

+:10033000000A090401000103010200092111010062

+:1003400001224D000705820308000A09040200018A

+:100350000300000009211101000122360007058376

+:100360000308000A09040300010300000009211129

+:100370000100012239000705840310000112011059

+:100380000100000008EDFE07130100010200010555

+:10039000010906A101050719E029E71500250195C6

+:1003A0000875018102050819012905950575019156

+:1003B000029501750391010507190029771500259C

+:1003C00001957875018102C005010980A1018502AE

+:1003D00016010026B7001A01002AB7007510950112

+:1003E0008100C0050C0901A1018503160100269CAE

+:1003F000021A01002A9C02751095018100C00501B6

+:100400000902A1010901A100050919012905150029

+:10041000250195057501810295017503810105018D

+:10042000093009311581257F950275088106093843

+:100430001581257F950175088106050C0A3802157E

+:1004400081257F950175088106C0C005010906A1B7

+:1004500001050719E029E7150025019508750181B7

+:100460000295017508810105081901290595057591

+:100470000191029501750391010507190029FF15E6

+:100480000025FF950675088100C0000000000000EF

+:100490000000000000010204060A0F17202C3A4A4F

+:1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2

+:1004B000B39D87715D4A3A2C20170F0A060402018A

+:1004C0000000000000000000000011241FBECFEF5C

+:1004D000DAE0DEBFCDBF04B603FE27C08091EF0196

+:1004E0009091F001A091F101B091F2018730904B11

+:1004F000A740B04BD1F41092EF011092F00110928E

+:10050000F1011092F20114BE84B7877F84BF0FB649

+:10051000F894A895809160008861809360001092A3

+:1005200060000FBEE0E0FFE3099511E0A0E0B1E05C

+:10053000E8E1F6E402C005900D92A433B107D9F7C3

+:1005400021E0A4E3B1E001C01D92AF3EB207E1F7A4

+:100550000E94F6080C940A230C94000061110BC051
<