Mostly PSR-2 compliant

There is one fail related to extending a CakePHP core method that is not yet PSR-2 compliant as it begins with an underscore.

Will merge after #24