[CHORE] Added Coveralls and Istanbul for code coverage
Fix merge conflict. #65