wip
Merge remote-tracking branch 'upstream/master' into seann
NeffReactor purely by config
Merge pull request #64 from seannives/seann

Seann