Updated code to be PSR-2 compliant.
Merge branch 'master' of git@github.com:localgod/Karla.git