removing notes file from repo as per seb
Seb code review comment blocks
template.php function comments
formatting
resolving conflicts on template.php