Merge pull request #461 from bmeeks8/master

Snort Package v 2.5.9 Update
Merge remote-tracking branch 'upstream/master'
Incorporate Ermal's comment to condense code.  No functionality change.