hopefully fix travis/coveralls
merge