Changes to reflect the new vendor-free approach
Added .editorconfig
Whitespace police
Merge branch 'develop' into feature/vendor_free
Merge branch 'feature/vendor_free' into develop