Merge branch 'release/2.0.0'
Merge branch 'master' into develop
Fix issue where statix server would use the global CLI in local mode, also general cleanup