Bug fixing and travis CI integration

It solves a bug when conflicted properties have only one value. Integrates with Travis CI and adds the build status to the README.