Whitespace cleanup, round 2

This (hopefully) fixes the remaining issues with excess whitespace
issues within system/

I missed library/template.php completely last time on the mixed spaces
and tabs to tab conversions. Everything else is removing more excess
whitespace an one or two minor spaceing fixes.