Updated JavaDoc, added more tests
Corrected some OSGi stuff and added DOAP plugin