Newer version of coveralls
Running make test on travis
More unit tests
Merge branch 'master' into staging