Merge pull request #46 from jcollie/master

Add Wireshark
Update Wireshark to 1.11.1