WIP: fix coveralls.io reporting. Not ready to merge.

Need to remove the second commit if this works (just testing now).