Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorcbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Wed, 23 Nov 2016 22:47:16 +0000 (17:47 -0500)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Wed, 23 Nov 2016 22:47:16 +0000 (17:47 -0500)

Trivial merge