Git ignore issues.
More git merge issues
Changes to launcher so it uses the proper JGroups arguments.
Merge branch 'master' of https://github.com/worldgnat/dist-sys-project