No yadayada in Perl 5.10
Fixed conflict
Added travis.yml