Grab current master of functions.php & tmpl.php
Re-adding changes in functions.php & tmpl.php. Commenting out canonical host in htaccess.