Updated Composer

This updates us to phpunit 4, and removes a redundant composer option.