Merge remote-tracking branch 'upstream/master'

Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

Addresses #290

Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck

Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

Links to build guide

Corrects typo

Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile

New per-folder format for ErgoDox EZ keymaps

Merge branch 'master' into j3rn-keymap

Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

Merge pull request #74 from sethherr/patch-3

Fix homebrew references

Fix homebrew references

Replaces #64

Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

Merge pull request #63 from MattLeBeauViewpoint/master

Small change to filename spelling in README

Small change to filename spelling in README

Edited filename to remove plural case in example so that prefix is
correctly parsed in step 6.

Merge branch 'master' of github.com:jackhumbert/qmk_firmware

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c

Updates readme

Further clarifies README