Refactor templates to have consistent indents

I swept through all the templates and made sure 4 space indents were
used. Now that I'm finished, I think I'd prefer they were 2 space
indents. >:[ Aw well, they should be consistent now at least.