avoid compile warnings due to deprecated code in junit
Merge branch 'travis' into junitwarnings
Merge pull request #29 from davidkarlsen/junitwarnings

avoid compile warnings due to deprecated code in junit