Merge pull request #997 from hnyman/madwifi-cleanup