Brought the package more inline with PSR-0

Travis build fixed