Make new classes PSR-2 compliant
Probably fix SPL_Types problem with Travis CI