Merge changes for integrationg with Travis CI and Coveralls