Junit update

Updated Junit to 4.11 with corresponding changes to 'matcher' classes in order to re-enable archive tests. Also some minor typo fixes and javadoc changes.