Add CodeClimate coverage
Fix travis.yml
Add coverage badge
Resolve merge conflicts