Made a trivial, non-invasive, OSGi addition to the parent pom
Added idea folder to gitignore.
Set an ignore comment on the failing testcase. Ran PMD on the code to clean up some unused modifiers.
Merged gitignore versions.
Added some codestyle-induced fixes.
Merge of lennartj-master, code style fixes