Merge pull request #125 from arthurwolf/fix/NullStream

Fix/null stream
cleaning up main.cpp
the new Player module was not created in main.cpp, fixing
removing G90 from main.cpp
fixed merge error from the rename of Conveyor
Merge pull request #128 from logxen/edge

fixed merge error from the rename of Conveyor
Merge remote-tracking branch 'upstream/edge' into working
update config