Begin work on allowing PHP 5.4

This is related to #56