keymap.c changes, disable grep stuff

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

I guess I can reference #90 in the commit message

I guess I can reference #90 in the commit message

added error for keymap file not existing

new keymap folder structure and makefile magic

working

Merge pull request #89 from coderkun/master

add coderkun’s ErgodoxEZ keymap (Neo2)

Merge pull request #87 from sboesebeck/master

added some macros, create full de_osx include file

merge upstream

merge upstream

add basic layer 2

updated cheat sheet, hex file

using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination

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

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

Merge pull request #84 from sboesebeck/master

new alternative layout ADNW_Koy

Merge pull request #83 from lxol/feature/hhkb-qmk

migrate hhkb to QMK firmware

updating layout png

adding fixed hex file