Merge remote-tracking branch 'upstream/master'

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

Adds next tab/prev tab back to symb layer and updates legend

A little more tweaking

Tweaks layers 1 & 2 in my experimental layout

Uses @eltang's famous macro! Still not perfect though :(

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

Adds brackets to inner vertical keys in experimental layout

Honing in on an interval that works for me

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 into modifier-release-fix

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

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

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

Merge pull request #3 from jackhumbert/master

Pull upstream

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

Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h

Merge pull request #190 from yoyoerx/function_pointers

Addressing void* return warning & coding style

Addressed void* return warning in all keymaps