Upgrade to JUnit 4.11
.classpath update
Merge branch 'master' of github.com:cbeust/testng