make it all compatible with phpunit 4.1
update travis config