Merge remote-tracking branch 'upstream/master'

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

Update build guide with instructions to copy the whole keymap folder (#315)

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

Merge pull request #5 from jackhumbert/master

Sync with upstream

Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix

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

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

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

Merge pull request #224 from NoahAndrews/make-keymap-names-consistent

Make keymap names more consistent

Updated several keyboard folders to use new keymap naming scheme

Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent

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

Merge pull request #220 from NoahAndrews/improve-buildguide

Added clarifying steps to Windows section of build guide

Added clarifying steps to Windows section of build guide

Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide

Merge remote-tracking branch 'origin/master'

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

Merge pull request #218 from awpr/patch-1

Add avr-libc to the Debian build dependencies.

Add avr-libc to the Debian build dependencies.

Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.