Changed location of autoload.php
Removed some debugging code
Automated the process of chosing between static and this calls