initial coveralls
fix coveralls call
Merged upstream master
More merge fixes
Remove even more merge issues
Added coveralls badge to readme
Merge pull request #56 from squirrelo/coveralls

Coveralls