Improved various detection routines
Merge branch 'master' of https://github.com/Daapii/CMSpwn

Conflicts:
	cmspwn.py
Improved the detection rate of multiple modules