minor cleanup in prep for 4.0
Merge remote-tracking branch 'origin/master' into v400
4.0 update to template files, needed function.php