cleaned up extra shit, moved latest two-col proto into site_template