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

PR190hotfix.sh, fresh hexes, makeallhex.sh script

Addressed void* return warning in all keymaps

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

Merge branch 'jackhumbert-master'

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

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

Merge pull request #157 from DidierLoiseau/typematrix

Small fixes and improvements to tm2030 layout

Updated tm2030 keymap.hex

Fixed compilation warnings due to missing return statements

FN macro: use layer_invert() instead of modifying layer_state directly

- fixes stuck keys from the temporary layers
  (see also jackhumbert/qmk_firmware#78)
- removed the workaround for jackhumbert/qmk_firmware#81
  (using layer_invert() fixes the problem)

Fixed inconsistency between comment and actual numeric layer

- KC_INS should only be present on Fn layer

Fixed link to Magic doc in Dvorak section