Minor update
Removing some junk from queries.xml
Minor style update
Merge branch 'master' of github.com:sqlmapproject/sqlmap
Removing unused imports
Some PEP8 related style cleaning