Merge pull request #883 from climbalima/master

added rev2 lets split after merging with qmk

fixed readme conflicts

should have fixed conflixed

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

Merge https://github.com/climbalima/qmk_firmware

Updated my repo to current qmk

Merge pull request #882 from seebs/master

dvorak/plover keyboard layout

dvorak/plover keyboard layout

Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?

Signed-off-by: seebs <seebs@seebs.net>

Merge pull request #880 from psyill/master

Added keymap "videck", an ErgoDox keymap for Vi(m) users.

Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap

update sethbc ergodox keymap

Merge pull request #877 from sethbc/update_sethbc_satan_keymap

update sethbc keymap

Merge pull request #876 from Dbroqua/master

Updated kc60/dbroqua layout and added satan/dbroqua_hhkb

Merge pull request #866 from fredizzimo/infinity60_clockfixes

Increase the infinity60 system tick frequency

Merge pull request #860 from IBNobody/master

Improved Quantum Matrix

fixed conflict

fixed extra paste

Added keymap "videck", an ErgoDox keymap for Vi(m) users.

oops, fixed inverted if statement

update sethbc ergodox keymap

update sethbc keymap