pre-merge
Merge remote-tracking branch 'origin' into jgke
modules.h anti github cpp
merge master to jgke
broken commit, don't use
slightly better wireless
merge master to jgke
wireless quality etc, closes #14