Switch to junit 4.11
Merge pull request #291 from aaime/junit411

Switch to junit 4.11