More ignores for Eclipse
minor formatting changes to the packet listing
Merge remote-tracking branch 'upstream/master'