small test cleanup
Merge branch 'master' of https://github.com/psiegman/ehcachetag
improve javadoc
upgrade mockito version
Merge branch 'master' of https://github.com/psiegman/ehcachetag