Moved imports for optional features to respect option choices in config file
Merge branch 'master' of https://github.com/Xen0ph0n/malwarehouse
k