Add a toggle to enable stripping whitespace on file save
Merge repo reference changes