Added support for per-file trailing spaces and final newline settings
Removed some commented-out stuff