[+] Added LynxGuide plugin
Merge remote branch 'upstream/master'
[!] Bug fix: fixed bug with ghdb "filetype" matches

False positive matches were returned when scanning files on the local filesystem. This should be fixed now.
[~] Updated Apache plugin
[~] Merged plugins/Apache-Wicket.rb and plugins/wicket.rb into
plugins/Apache-Wicket.rb
Updated README and man pages

slightly
[+] Added Newscoop plugin
[+] Added Kerio-WinRoute-Firewall plugin
[+] Added TRIDENT7-Wave7-OLT plugin
[+] Added PacketWave plugin
Fixed bug with raw_headers. Before raw_headers would be combined for multiple targets.
I'm unsure exactly what change fixed this...
Improved Target inspection
Removed some comments from apache plugin
Merge remote-tracking branch 'bcoles/master'

Conflicts:
	plugins/apache.rb
updated apache
Issue #74 workaround
Updated ActiveX plugin to return the CLSID as a module. Fixed bug where quotes were required
Bug fix - failed when regexp results contained nils. this happens when using () in a regex to pad out the array of regexp results to a particular number for use with offset.
updated ActiveX plugin. outputs clsid and detects when it's a flash activex object
detects html object tag and returns the classid, codebase, codetype, and type