Coils: cleared up the default template a bit
Merge branch 'website'
Merge branch 'master' into connecttous