Reformat all the things!

puppet-lint lead me to do this.  I retabbed and moved some things around.
No functional changes!