Fix indenting so that graphs and thresholds are included in all templates, not just the last one.
Fixed another indenting issue, which was causing graphpoints to be omitted.
Merge branch 'master' of https://github.com/zenoss/ZenPackGenerator
Horribly hackish fix for problems with graphpoints.
Merge branch 'master' of https://github.com/joshw/ZenPackGenerator