Merge remote-tracking branch 'upstream/master'

134 files changed, 23952 insertions, 10271 deletions

diff --git a/.gitignore b/.gitignore
index 8b8c45169d..a082ea22e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,8 @@ build/
 .vagrant/
 .DS_STORE
 
-# Eclipse Settings
+# Eclipse/PyCharm/Other IDE Settings
 .cproject
 .project
 .settings/
-
+.idea
diff --git a/BUILD_GUIDE.md b/BUILD_GUIDE.md
index f7a57d2fc9..fd8b6202ff 100644
--- a/BUILD_GUIDE.md
+++ b/BUILD_GUIDE.md
@@ -47,8 +47,8 @@ If you have any problems building the firmware, you can try using a tool called
 
 Note: Some keyboard folders have non-standard organizations, and may not even support specifying alternate keymaps. Until these get reorganized, you will need to edit their default keymaps directly.
 
-1. Running the `make` command from your keyboard's folder will generate a .hex file based on the default keymap. All keymaps for a particular keyboard live in the `keymaps` folder in that keyboard's folder. To create your own keymap, copy `keymaps/default/keymap.c` to the `keymaps` folder, and rename it with your name, for example jack.c. Or, if you don't care about the ability to share your keymap with the community via GitHub, you can just modify the default keymap itself. Details on how to program keymap files can be found in other guides. 
-2. To build a keymap other than the default, type `KEYMAP=<name>` after `make`. So if I've named my keymap jack.c, the full command would be `make KEYMAP=jack`.
+1. Running the `make` command from your keyboard's folder will generate a .hex file based on the default keymap. All keymaps for a particular keyboard live in the `keymaps` folder in that keyboard's folder. To create your own keymap, duplicate the folder `keymaps/default`, and rename it with your name, for example `jack`. Or, if