added coveralls pkgeval hooks and badges
modified travis file
fixed merge conflict with master
changed branch in coveralls badge to 'master'