CLeaned up code more. Fixed a bunch of bugs with coveralls report generation