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

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

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

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

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

Merge pull request #247 from NoahAndrews/fix-path-script

Fix important bugs in the path script for Windows

Added admin privilege check

Running this as a non-administrator appears to work at first, but the
changes wouldn't stick on my Win 8.1 system.  It's weird, but this
script needs to run as admin.

Updated comment

Remove failing check

NEWPATH1 (C:\MinGW\msys\bin) won't actually be created until the second
script is run

Merge pull request #5 from jackhumbert/master

Sync with upstream

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

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

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

Merge pull request #230 from IBNobody/master

Fixed Setup Script

Drastically rewrote the path script to handle Explorer's stubborn grasp of EnvVars. Tested on Win7.

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

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

Merge pull request #223 from NoahAndrews/patch-3

Fix #198

Fix #198

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