cleanup template
suggest conditionals in template
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #195 from impaler/dev

Update the template