Trivial cosmetics
Merge branch 'master' of github.com:sqlmapproject/sqlmap
Better naming
Minor fine tuning