2nd push toward PHP-centric merge
3rd push toward PHP-centric merge
Removed a stupid index.php leftover