cleaned up code
Merge branch 'master' of https://github.com/ChrisRunyon/php-framework