Update .travis.yml
Merge remote-tracking branch 'upstream/master'
updating the coveralls plugin
small changes to avoid a NullPointerException
Merge pull request #22 from D-Roch/master

Coveralls is failing in travis