Moving everything around, tap delays driving me nuts

Merge branch 'master' of github.com:dragon788/qmk_firmware_ez

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

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c

Merge branch 'master' of github.com:dragon788/qmk_firmware_ez

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c

Updated keymap ascii art and made thumb cluster more standard ErgoDox/Kinesis-like

Merge pull request #56 from sboesebeck/master

fix number pad for german keys

Updates readme

fix number pad for german keys

Merge pull request #55 from sboesebeck/master

fixed some typos, learned, DE_-keycodes are for Win, not OSX

fixed some typos, learned, DE_-keycodes are for Win, not OSX

Merge pull request #53 from sboesebeck/master

minor updates

new firmware file containing current changes

added png file for layout documentation

minor changes, fixes

Merge pull request #52 from technovangelist/master

first attempt at a working workman layout for the ergodoxez

swapped the space and enter to get the space under where the thumb is.

first attempt at a working workman layout for the ergodoxez

Merge pull request #47 from pnutster/master

OSX Kinesis-like Mapping

Merge pull request #46 from sboesebeck/master

German layout for osx

Fixed keymap "graphic"