Some more cleanup.
Merge branch 'master' of https://github.com/bryanbickford/MalwareSDK into jeff