Little typos fixed
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Revert "Revert "added some more low level decoder""

This reverts commit ec6fc067a22b0a1c57504c2c5ca1188a61f95920.

Conflicts:
	include/ec_proto.h
Revert "Revert "register ip over pppoe""

This reverts commit 8c1672f667c6e59b52a25f75cff7ad0586e7ec5b.
Merge remote-tracking branch 'upstream/master'
Deprecate the napster dissector.
Merge pull request #162 from eaescob/master

Re-added lowlevel decoders
Merge remote-tracking branch 'upstream/master'
Disabled update feature
Removed update references
Merge pull request #163 from jacob-baines/remove_napster

Deprecate the Napster Dissector
Merge pull request #164 from LocutusOfBorg/master

Addressed issue #155