The FIXMES are fixed now.
Clean up the PHP tests
Fix whitespace
Merge branch 'redragonx-compatible' into compatible-versions

Conflicts:
	test.php
	tests/test.php
Remove test.php (again?)