Merge pull request #56 from andytruong/features/cleanup-autoloader

Cleanup autoloader
Merge branch '7.x-2.x' into features/psr0-testcase

* 7.x-2.x:
Use PSR-0 for test cases > Try to remove warning.