Used more of the builtin's for Django templates in template-wizard

I liked the way Nate broke the panes into left and right included panes
in the template.  I cleaned up the template-wizard some, adding block
usage, now the view source looks more reasonable without repeated
elements