Coveralls initial checkin

Also some minor syntax and whitespace changes to make code follow
better standards