Update comments

Remove CSS comments

Convert comments in ERB to Ruby comments so that they're not
rendered in HTML.  this means removing the % in commented out
ERB functions too.