More composer fixes
Updated for phpunit 4.0
Fix line breaks in log files because of Monolog change.
Fix typo.
Merge 4.1.