Formatting updates and changes formatting style file back to keeping indents on blank lines.  Easier to keep at this point since it wants to delete them all and touch nearly every file otherwise.