Updating tests to be PHP 5.4 compliant
Merge branch 'master' of https://github.com/brandonsavage/shithappens