[Erez & Jack] Packages Space Cadet shifts into keycodes

[Erez & Jack] Documents new Leader key functionality

Adds explanatory note re history of TMK and QMK

Merge remote-tracking branch 'upstream/master'

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

[Erez & Jack] Documents audio output

Merge pull request #311 from adiabatic/ergodox-zweihander-osx

Add KC_LABK and KC_RABK (< and >)

Add KC_L[LR]ABK to top-level README

[Erez & Jack] Updates docs with one-shot information and config_user.h

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

Updating my entry in the README

resolves conflicts in rgblight.c

# Conflicts:
#	quantum/rgblight.c

updates README, fixes typo in new_project.sh

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

[Erez & Jack] Examples for advanced macro stuff

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

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

Merge pull request #264 from ericlathrop/patch-1

Fix typo

Fix typo

Merge remote-tracking branch 'refs/remotes/origin/personal_atomic_planck'