Minor removal of redundant code
Minor removal of unused function
Minor update
Removing some obsolete functions
Better naming
Removing obsolete proxy handling code (Python < 2.6)
Merge branch 'master' of github.com:sqlmapproject/sqlmap