Better travis.yml file.
Test with 2 version of PHP.
fix conflict