Adding an autoloader so that PHPUnit can find everything, hopefully.
Fixing conflict between  master and branch.

Conflicts:
	tests/unit/bootstrap.php