BROKEN: Various changes, breaks webvulnscan.
Merge branch 'master' of github.com:SysTheron/webvulnscan