template indentation cleanups, refs #24
Merge branch 'develop' of github.com:klpdotorg/dubdubdub into develop