wip
Merge branch 'master' into integrate-new-builder
wip 2
moved stuff into comment
use this for dev
shouldn't reload everything on cli file change now
cleaning up some config options
cleaning up some debug info
todo changes