PSR-0 corrections
Merge branch 'master' of git://github.com/joelalejandro/Descanse